From 3156ecacc3c6a14181feeda4357440f76fe3d1c6 Mon Sep 17 00:00:00 2001
From: Andrey Orst <andreyorst@gmail.com>
Date: Tue, 6 Aug 2019 17:02:51 +0300
Subject: [PATCH 1/2] fix #3043

---
 rc/filetype/rust.kak | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rc/filetype/rust.kak b/rc/filetype/rust.kak
index 2ba7d075..d7addb81 100644
--- a/rc/filetype/rust.kak
+++ b/rc/filetype/rust.kak
@@ -44,7 +44,10 @@ add-highlighter shared/rust/string           region %{(?<!')"} (?<!\\)(\\\\)*"
 add-highlighter shared/rust/raw_string       region -match-capture %{(?<!')r(#*)"} %{"(#*)} fill string
 add-highlighter shared/rust/comment          region -recurse "/\*" "/\*" "\*/"              fill comment
 add-highlighter shared/rust/line_comment     region "//" "$"                                fill comment
-add-highlighter shared/rust/macro_attributes region "#!?\[" "\]"                            fill meta
+
+add-highlighter shared/rust/macro_attributes region -recurse "\[" "#!?\[" "\]" regions
+add-highlighter shared/rust/macro_attributes/ default-region fill meta
+add-highlighter shared/rust/macro_attributes/inner region %{(?<!')"} (?<!\\)(\\\\)*" fill string
 
 add-highlighter shared/rust/code/byte_literal         regex "'\\\\?.'" 0:value
 add-highlighter shared/rust/code/long_quoted          regex "('\w+)[^']" 1:meta

From 396236f7280c68921ff13137b5797bc35182ac13 Mon Sep 17 00:00:00 2001
From: Andrey Orst <andreyorst@gmail.com>
Date: Wed, 7 Aug 2019 11:37:02 +0300
Subject: [PATCH 2/2] support raw strings withing the meta attributes

---
 rc/filetype/rust.kak | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rc/filetype/rust.kak b/rc/filetype/rust.kak
index d7addb81..0fc61af2 100644
--- a/rc/filetype/rust.kak
+++ b/rc/filetype/rust.kak
@@ -47,7 +47,8 @@ add-highlighter shared/rust/line_comment     region "//" "$"
 
 add-highlighter shared/rust/macro_attributes region -recurse "\[" "#!?\[" "\]" regions
 add-highlighter shared/rust/macro_attributes/ default-region fill meta
-add-highlighter shared/rust/macro_attributes/inner region %{(?<!')"} (?<!\\)(\\\\)*" fill string
+add-highlighter shared/rust/macro_attributes/string region %{(?<!')"} (?<!\\)(\\\\)*" fill string
+add-highlighter shared/rust/macro_attributes/raw_string region -match-capture %{(?<!')r(#*)"} %{"(#*)} fill string
 
 add-highlighter shared/rust/code/byte_literal         regex "'\\\\?.'" 0:value
 add-highlighter shared/rust/code/long_quoted          regex "('\w+)[^']" 1:meta