From b5321f3d1b04cfe7083cc98d51a22d4750c4a1ef Mon Sep 17 00:00:00 2001
From: Frank LENORMAND <lenormf@gmail.com>
Date: Mon, 24 Jun 2019 10:12:29 +0300
Subject: [PATCH 1/2] rc filetype d: Highlight line tokens properly

---
 rc/filetype/d.kak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rc/filetype/d.kak b/rc/filetype/d.kak
index 16c6d8d1..b968fab0 100644
--- a/rc/filetype/d.kak
+++ b/rc/filetype/d.kak
@@ -54,7 +54,7 @@ add-highlighter shared/d/code/ regex %{'((\\.)?|[^'\\])'} 0:value
 add-highlighter shared/d/code/ regex "-?([0-9_]*\.(?!0[xXbB]))?\b([0-9_]+|0[xX][0-9a-fA-F_]*\.?[0-9a-fA-F_]+|0[bb][01_]+)([ep]-?[0-9_]+)?[fFlLuUi]*\b" 0:value
 add-highlighter shared/d/code/ regex "\b(this)\b\s*[^(]" 1:value
 add-highlighter shared/d/code/ regex "((?:~|\b)this)\b\s*\(" 1:function
-add-highlighter shared/d/code/ regex '#\s*line\b.*' 0:meta
+add-highlighter shared/d/code/ regex '(#line)\h+(\d+)(\h+"[^"\n]*")?' 1:meta 2:value 3:string
 
 evaluate-commands %sh{
     # Grammar

From e5b9761818f07af4ee94c6522f434201d7d36cc9 Mon Sep 17 00:00:00 2001
From: Frank LENORMAND <lenormf@gmail.com>
Date: Mon, 24 Jun 2019 10:18:43 +0300
Subject: [PATCH 2/2] rc filetype d: Highlight quoted backticks properly

Fixes #2970
---
 rc/filetype/d.kak | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rc/filetype/d.kak b/rc/filetype/d.kak
index b968fab0..ccc841d7 100644
--- a/rc/filetype/d.kak
+++ b/rc/filetype/d.kak
@@ -38,8 +38,7 @@ provide-module d %§
 add-highlighter shared/d regions
 add-highlighter shared/d/code default-region group
 add-highlighter shared/d/string region %{(?<!')(?<!'\\)"} %{(?<!\\)(?:\\\\)*"} group
-add-highlighter shared/d/verbatim_string1 region ` ` fill meta
-add-highlighter shared/d/verbatim_string2 region %{(?<!')(?<!'\\)`} %{(?<!\\)(?:\\\\)*`} fill meta
+add-highlighter shared/d/verbatim_string region %{(?<!')(?<!'\\)`} %{(?<!\\)(?:\\\\)*`} fill meta
 add-highlighter shared/d/verbatim_string_prefixed region %{r`([^(]*)\(} %{\)([^)]*)`} fill meta
 add-highlighter shared/d/disabled region '/\+[^+]?' '\+/' fill comment
 add-highlighter shared/d/comment1 region '/\*[^*]?' '\*/' fill comment