xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rc: conservative comment highlighting for shells

Browse Source 
Fixes spurious comment highlighting for these examples:

	echo \# foo
	echo 1#foo
	echo 2\ #foo
This commit is contained in:
Johannes Altmanninger 2020-07-18 23:18:07 +02:00
parent c2516f02f6
commit e612f26ec1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rc/filetype/fish.kak
View File

@ -35,7 +35,7 @@ add-highlighter shared/fish regions
add-highlighter shared/fish/code default-region group add-highlighter shared/fish/code default-region group
add-highlighter shared/fish/double_string region (?<!\\)(?:\\\\)*\K" (?<!\\)(\\\\)*" group add-highlighter shared/fish/double_string region (?<!\\)(?:\\\\)*\K" (?<!\\)(\\\\)*" group
add-highlighter shared/fish/single_string region (?<!\\)(?:\\\\)*\K' (?<!\\)(\\\\)*' fill string add-highlighter shared/fish/single_string region (?<!\\)(?:\\\\)*\K' (?<!\\)(\\\\)*' fill string
add-highlighter shared/fish/comment region '#' '$' fill comment add-highlighter shared/fish/comment region (?<!\\)(?:\\\\)*(?:^|\h)\K# '$' fill comment
add-highlighter shared/fish/double_string/ fill string add-highlighter shared/fish/double_string/ fill string
add-highlighter shared/fish/double_string/ regex (\$\w+)|(\{\$\w+\}) 0:variable add-highlighter shared/fish/double_string/ regex (\$\w+)|(\{\$\w+\}) 0:variable

2
rc/filetype/makefile.kak
View File

@ -30,7 +30,7 @@ provide-module makefile %{
add-highlighter shared/makefile regions add-highlighter shared/makefile regions
add-highlighter shared/makefile/content default-region group add-highlighter shared/makefile/content default-region group
add-highlighter shared/makefile/comment region '#' '$' fill comment add-highlighter shared/makefile/comment region (?<!\\)(?:\\\\)*(?:^|\h)\K# '$' fill comment
add-highlighter shared/makefile/evaluate-commands region -recurse '\(' '\$\(' '\)' fill value add-highlighter shared/makefile/evaluate-commands region -recurse '\(' '\$\(' '\)' fill value
add-highlighter shared/makefile/content/ regex ^\S.*?(::|:|!)\s 0:variable add-highlighter shared/makefile/content/ regex ^\S.*?(::|:|!)\s 0:variable

2
rc/filetype/sh.kak
View File

@ -23,7 +23,7 @@ add-highlighter shared/sh/code default-region group
add-highlighter shared/sh/double_string region %{(?<!\\)(?:\\\\)*\K"} %{(?<!\\)(?:\\\\)*"} group add-highlighter shared/sh/double_string region %{(?<!\\)(?:\\\\)*\K"} %{(?<!\\)(?:\\\\)*"} group
add-highlighter shared/sh/single_string region %{(?<!\\)(?:\\\\)*\K'} %{'} fill string add-highlighter shared/sh/single_string region %{(?<!\\)(?:\\\\)*\K'} %{'} fill string
add-highlighter shared/sh/expansion region '\$\{' '\}|\n' fill value add-highlighter shared/sh/expansion region '\$\{' '\}|\n' fill value
add-highlighter shared/sh/comment region '(?<!\$)(?<!\$\{)#' '$' fill comment add-highlighter shared/sh/comment region (?<!\\)(?:\\\\)*(?:^|\h)\K# '$' fill comment
add-highlighter shared/sh/heredoc region -match-capture '<<-?\h*''?(\w+)''?' '^\t*(\w+)$' fill string add-highlighter shared/sh/heredoc region -match-capture '<<-?\h*''?(\w+)''?' '^\t*(\w+)$' fill string
add-highlighter shared/sh/double_string/fill fill string add-highlighter shared/sh/double_string/fill fill string