From 228a8dd9ae00fd461ad2a46345e66472a105d04d Mon Sep 17 00:00:00 2001
From: tawsi-melek <34323926+tawsi-melek@users.github.com>
Date: Mon, 12 Aug 2019 16:40:35 +0200
Subject: [PATCH] Fix some more edge cases

* Adapt the char literal highlighter from c-family.kak
* Fix line comment adjacent to char literal not being highlighted
* Fix single quote terminating a double quote string
---
 rc/filetype/nim.kak | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rc/filetype/nim.kak b/rc/filetype/nim.kak
index eb47375a..4597a36f 100644
--- a/rc/filetype/nim.kak
+++ b/rc/filetype/nim.kak
@@ -37,9 +37,9 @@ add-highlighter shared/nim regions
 add-highlighter shared/nim/code default-region group
 add-highlighter shared/nim/triple_string region '([A-Za-z](_?\w)*)?"""' '"""(?!")' fill string
 add-highlighter shared/nim/raw_string region [A-Za-z](_?[A-Za-z])*" (?<!")"(?!") fill string
-add-highlighter shared/nim/string region (?<!'\\)"(?!') (?<!\\)(\\\\)*" group
+add-highlighter shared/nim/string region (?<!'\\)" ((?<!\\)(\\\\)*"|$) group
 add-highlighter shared/nim/comment region '#?#\[' '\]##?' group
-add-highlighter shared/nim/comment_line region (^|[^'])#?#[^\[] $ group
+add-highlighter shared/nim/comment_line region (?<![^'].')#?#(?!'\[) $ group
 
 add-highlighter shared/nim/string/fill fill string
 add-highlighter shared/nim/comment/fill fill comment
@@ -101,7 +101,7 @@ evaluate-commands %sh{
 }
 
 add-highlighter shared/nim/code/ regex '(,|;|`|\(\.?|\.?\)|\[[.:]?|\.?\]|\{\.?|\.?\})' 0:meta
-add-highlighter shared/nim/code/ regex %{'(\\([rcnlftvabe\\"']|0*[12]?\d?\d|x[0-9a-fA-F]{2})|[^'\n])'} 0:string
+add-highlighter shared/nim/code/char regex %{\B'(\\x[0-9a-fA-F]{2}|\\"|(\\.)|[^'\\])'\B} 0:value
 
 # Commands
 # ‾‾‾‾‾‾‾‾