Merge remote-tracking branch 'lenormf/fix-2970'

This commit is contained in:
Maxime Coste 2019-06-24 19:29:02 +10:00
commit 196b38b2e0

View File

@ -38,8 +38,7 @@ provide-module d %§
add-highlighter shared/d regions add-highlighter shared/d regions
add-highlighter shared/d/code default-region group add-highlighter shared/d/code default-region group
add-highlighter shared/d/string region %{(?<!')(?<!'\\)"} %{(?<!\\)(?:\\\\)*"} group add-highlighter shared/d/string region %{(?<!')(?<!'\\)"} %{(?<!\\)(?:\\\\)*"} group
add-highlighter shared/d/verbatim_string1 region ` ` fill meta add-highlighter shared/d/verbatim_string region %{(?<!')(?<!'\\)`} %{(?<!\\)(?:\\\\)*`} fill meta
add-highlighter shared/d/verbatim_string2 region %{(?<!')(?<!'\\)`} %{(?<!\\)(?:\\\\)*`} fill meta
add-highlighter shared/d/verbatim_string_prefixed region %{r`([^(]*)\(} %{\)([^)]*)`} 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/disabled region '/\+[^+]?' '\+/' fill comment
add-highlighter shared/d/comment1 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 "-?([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:value
add-highlighter shared/d/code/ regex "((?:~|\b)this)\b\s*\(" 1:function 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{ evaluate-commands %sh{
# Grammar # Grammar