summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2019-06-24 19:29:02 +1000
committerMaxime Coste <mawww@kakoune.org>2019-06-24 19:29:02 +1000
commit196b38b2e0b8c8babfeffec786ef9ad948e976e6 (patch)
tree508b76d1de13ed7adaef65f5224bb29dda223964
parent034e7260680d421d4d90b245ca8b239fa3084557 (diff)
parente5b9761818f07af4ee94c6522f434201d7d36cc9 (diff)
Merge remote-tracking branch 'lenormf/fix-2970'
-rw-r--r--rc/filetype/d.kak5
1 files changed, 2 insertions, 3 deletions
diff --git a/rc/filetype/d.kak b/rc/filetype/d.kak
index 16c6d8d1..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
@@ -54,7 +53,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