From a9ef25f1727b8e7a4ae325708c8a2c312e87d586 Mon Sep 17 00:00:00 2001
From: SolitudeSF <solitudesf@protonmail.com>
Date: Thu, 27 Dec 2018 21:34:07 +0200
Subject: [PATCH] rc: add missing builtin types, fix displaying of triple
 string literals, float literals, character literals, type suffixes, enable
 raw string literals, operators highlighting in nim

---
 rc/extra/nim.kak | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/rc/extra/nim.kak b/rc/extra/nim.kak
index 8ca36733..9effe343 100644
--- a/rc/extra/nim.kak
+++ b/rc/extra/nim.kak
@@ -13,14 +13,15 @@ hook global BufCreate .*\.nim(s|ble)? %{
 
 add-highlighter shared/nim regions
 add-highlighter shared/nim/code default-region group
-add-highlighter shared/nim/single_string region "'"   (?<!\\)(\\\\)*'  fill string
-add-highlighter shared/nim/double_string region '"' (?<!\\)(\\\\)*" fill string
-add-highlighter shared/nim/triple_string region '"""' '"""' fill string
+add-highlighter shared/nim/triple_string region '"""' '"""(?!")' fill string
+add-highlighter shared/nim/raw_string region '[A-Za-z](_?\w)*"' '(?<!")"(?!")' fill string
+add-highlighter shared/nim/string region '"' (?<!\\)(\\\\)*" fill string
 add-highlighter shared/nim/comment region '#?#\[' '\]##?' fill comment
 
-add-highlighter shared/nim/code/ regex \b(0[xXocCbB])?[\d_]+('[iIuUfFdD](8|16|32|64|128))?\b 0:value
-add-highlighter shared/nim/code/ regex \b\d+\.\d+\b 0:value
-add-highlighter shared/nim/code/ regex %{'[^'\n]'} 0:string
+add-highlighter shared/nim/code/ regex [=+-/<>@$~&%|!?^.:\\*]+ 0:operator
+add-highlighter shared/nim/code/ regex \b(0[xXocCbB])?[\d_]+('[iIuU](8|16|32|64)|'d|'f(32|64|128)?)?\b 0:value
+add-highlighter shared/nim/code/ regex \b\d[\d_]*\.\d[\d_]*([eE]\d[\d_]*)?('d|'f(32|64|128))?\b 0:value
+add-highlighter shared/nim/code/ regex %{'(\\([rcnlftvabe\\"']|\d+|x[0-9a-fA-F]{2})|[^'\n])'} 0:string
 
 evaluate-commands %sh{
     # Grammar
@@ -34,7 +35,8 @@ evaluate-commands %sh{
     keywords="${keywords}|with|without|xor|yield"
     types="int|int8|int16|int32|int64|uint|uint8|uint16|uint32|uint64|float"
     types="${types}|float32|float64|bool|char|object|seq|array|cstring|string"
-    types="${types}|tuple|varargs"
+    types="${types}|tuple|varargs|typedesc|pointer|byte|set|typed|untyped"
+    types="${types}|void"
     values="false|true"
 
     # Add the language's grammar to the static completion list