From 3ae0d86b2766b595c0d08188584ad057dfa5943d Mon Sep 17 00:00:00 2001
From: Dianne Wagner <diannes.gm@gmail.com>
Date: Sun, 18 Jun 2017 18:39:45 -0700
Subject: [PATCH 1/3] rust highlighter: '"' is not the start of a string

this uses the string opening regex from the c-family highlighter to prevent
highlighting the rest of the file as a string on encountering the character
literal '"'
---
 rc/base/rust.kak | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rc/base/rust.kak b/rc/base/rust.kak
index 69b1eb41..e352d7e4 100644
--- a/rc/base/rust.kak
+++ b/rc/base/rust.kak
@@ -12,9 +12,9 @@ hook global BufCreate .*[.](rust|rs) %{
 # ‾‾‾‾‾‾‾‾‾‾‾‾
 
 add-highlighter -group / regions -default code rust \
-    string  '"' (?<!\\)(\\\\)*"        '' \
-    comment //   $                     '' \
-    comment /\* \*/                   /\*
+    string  %{(?<!')"} (?<!\\)(\\\\)*"        '' \
+    comment //          $                     '' \
+    comment /\*        \*/                   /\*
 
 add-highlighter -group /rust/string  fill string
 add-highlighter -group /rust/comment fill comment

From 57cb2d0682f560b5f25fcd8052bb61f60e9965a1 Mon Sep 17 00:00:00 2001
From: Dianne Wagner <diannes.gm@gmail.com>
Date: Sun, 18 Jun 2017 19:16:54 -0700
Subject: [PATCH 2/3] apply '"' highlighting fix to haskell as well

---
 rc/base/haskell.kak | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rc/base/haskell.kak b/rc/base/haskell.kak
index 6a16aa14..341602e2 100644
--- a/rc/base/haskell.kak
+++ b/rc/base/haskell.kak
@@ -12,10 +12,10 @@ hook global BufCreate .*[.](hs) %{
 # ‾‾‾‾‾‾‾‾‾‾‾‾
 
 add-highlighter -group / regions -default code haskell \
-    string   '"'      (?<!\\)(\\\\)*"      ''  \
-    comment  (--[^>]) $                    ''  \
-    comment \{-       -\}                  \{- \
-    macro   ^\h*?\K#  (?<!\\)\n            ''
+    string   %{(?<!')"} (?<!\\)(\\\\)*"      ''  \
+    comment  (--[^>])   $                    ''  \
+    comment \{-         -\}                  \{- \
+    macro   ^\h*?\K#    (?<!\\)\n            ''
 
 add-highlighter -group /haskell/string  fill string
 add-highlighter -group /haskell/comment fill comment