mirror of
https://github.com/vim/vim.git
synced 2026-05-28 00:21:37 +02:00
runtime(make): fix wrong highlighting with $ inside double quotes
fixes: #19986 Co-authored-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
" 2025 Oct 25 by Vim project: update makeTargetinDefine highlighting (#18570)
|
||||
" 2025 Dec 23 by Vim project: fix too greedy match (#18938)
|
||||
" 2025 Dec 23 by Vim project: wrong highlight with paranthesis inside quotes (#18818)
|
||||
" 2026 Apr 17 by Vim project: wrong highlight $ inside quotes (#19986)
|
||||
|
||||
" quit when a syntax file was already loaded
|
||||
if exists("b:current_syntax")
|
||||
@@ -41,7 +42,7 @@ endif
|
||||
syn match makeIdent "\$\$\w*"
|
||||
syn match makeIdent "\$\$\$\$\w*" containedin=makeDefine
|
||||
syn match makeIdent "\$[^({]"
|
||||
syn match makeIdent "\$\$[^({]" containedin=makeDefine
|
||||
syn match makeIdent "\$\$[^({\"']" containedin=makeDefine
|
||||
if get(b:, 'make_flavor', s:make_flavor) == 'microsoft'
|
||||
syn region makeIdent start="\$(" end=")" contains=makeStatement,makeIdent,makeDString,makeSString
|
||||
syn region makeIdent start="\${" end="}" contains=makeStatement,makeIdent,makeDString,makeSString
|
||||
|
||||
+4
-4
@@ -14,7 +14,7 @@
|
||||
@75
|
||||
|d+0#00e0e07&|e|f|a|u|l|t|:| +0#0000000&@66
|
||||
| +0#e000002&@7|$+0#00e0e07&|(|c+0#af5f00255&|a|l@1| +0#00e0e07&|s|a|y|,|"+0#e000002&|H|e|l@1|o| |(|w|o|r|l|d|)|!|"|)+0#00e0e07&| +0#0000000&@38
|
||||
|~+0#4040ff13&| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
| +0#0000000&@56|1|,|1| @10|A|l@1|
|
||||
@75
|
||||
|f+0#00e0e07&|o@1|:| +0#0000000&@70
|
||||
| +0#e000002&@7|e|c|h|o| |"|b|a|r|$+0#00e0e07&@1|"+0#e000002&| |b|a|z| +0#0000000&@50
|
||||
@57|1|,|1| @10|A|l@1|
|
||||
|
||||
@@ -14,3 +14,6 @@ endef
|
||||
|
||||
default:
|
||||
$(call say,"Hello (world)!")
|
||||
|
||||
foo:
|
||||
echo "bar$$" baz
|
||||
|
||||
Reference in New Issue
Block a user