From 7abf04babdf9074232a3dac61a66979076558a55 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Sun, 17 Jun 2018 11:06:20 +1000
Subject: [PATCH] Improve highlighting of Kakrc string regions

Unfortunately Strings that start with a quoted quote (like '''str')
are still incorrectly highlighted, a deeper refactoring of the regions
highlighter will be necessary.
---
 rc/core/kakrc.kak   | 4 ++--
 src/highlighters.cc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rc/core/kakrc.kak b/rc/core/kakrc.kak
index 780506dd..9c279688 100644
--- a/rc/core/kakrc.kak
+++ b/rc/core/kakrc.kak
@@ -13,8 +13,8 @@ hook global BufCreate (.*/)?(kakrc|.*.kak) %{
 
 add-highlighter shared/ regions -default code kakrc \
     comment (^|\h)\K# $ '' \
-    double_string %{(^|\h)\K"} %{(?<!")("")*"(?!")} '' \
-    single_string %{(^|\h)\K'} %{(?<!')('')*'(?!")} '' \
+    double_string %{(^|\h)\K"} %{"(?!")} %{(?<!")("")+(?!")} \
+    single_string %{(^|\h)\K'} %{'(?!')} %{(?<!')('')+(?!')} \
     shell '(^|\h)\K%?%sh\{' '\}' '\{' \
     shell '(^|\h)\K%?%sh\(' '\)' '\(' \
     shell '(^|\h)\K%?%sh\[' '\]' '\[' \
diff --git a/src/highlighters.cc b/src/highlighters.cc
index 3f9fbf46..cf470c34 100644
--- a/src/highlighters.cc
+++ b/src/highlighters.cc
@@ -1709,7 +1709,7 @@ struct RegionMatches
                 return end_it;
 
             while (rec_it != recurse_matches.end() and
-                   rec_it->end_coord() <= end_it->begin_coord())
+                   rec_it->end_coord() <= end_it->end_coord())
             {
                 if (not capture or rec_it->capture == *capture)
                     ++recurse_level;