|
8 | 8 | " 2025 Oct 12 by Vim project: update makeDefine highlighting (#18403) |
9 | 9 | " 2025 Oct 25 by Vim project: update makeTargetinDefine highlighting (#18570) |
10 | 10 | " 2025 Dec 23 by Vim project: fix too greedy match (#18938) |
| 11 | +" 2025 Dec 23 by Vim project: wrong highlight with paranthesis inside quotes (#18818) |
11 | 12 |
|
12 | 13 | " quit when a syntax file was already loaded |
13 | 14 | if exists("b:current_syntax") |
@@ -42,15 +43,15 @@ syn match makeIdent "\$\$\$\$\w*" containedin=makeDefine |
42 | 43 | syn match makeIdent "\$[^({]" |
43 | 44 | syn match makeIdent "\$\$[^({]" containedin=makeDefine |
44 | 45 | if get(b:, 'make_flavor', s:make_flavor) == 'microsoft' |
45 | | - syn region makeIdent start="\$(" end=")" contains=makeStatement,makeIdent |
46 | | - syn region makeIdent start="\${" end="}" contains=makeStatement,makeIdent |
47 | | - syn region makeIdent start="\$\$(" end=")" containedin=makeDefine contains=makeStatement,makeIdent |
48 | | - syn region makeIdent start="\$\${" end="}" containedin=makeDefine contains=makeStatement,makeIdent |
| 46 | + syn region makeIdent start="\$(" end=")" contains=makeStatement,makeIdent,makeDString,makeSString |
| 47 | + syn region makeIdent start="\${" end="}" contains=makeStatement,makeIdent,makeDString,makeSString |
| 48 | + syn region makeIdent start="\$\$(" end=")" containedin=makeDefine contains=makeStatement,makeIdent,makeDString,makeSString |
| 49 | + syn region makeIdent start="\$\${" end="}" containedin=makeDefine contains=makeStatement,makeIdent,makeDString,makeSString |
49 | 50 | else |
50 | | - syn region makeIdent start="\$(" skip="\\)\|\\\\" end=")" contains=makeStatement,makeIdent |
51 | | - syn region makeIdent start="\${" skip="\\}\|\\\\" end="}" contains=makeStatement,makeIdent |
52 | | - syn region makeIdent start="\$\$(" skip="\\)\|\\\\" end=")" containedin=makeDefine contains=makeStatement,makeIdent |
53 | | - syn region makeIdent start="\$\${" skip="\\}\|\\\\" end="}" containedin=makeDefine contains=makeStatement,makeIdent |
| 51 | + syn region makeIdent start="\$(" skip="\\)\|\\\\" end=")" contains=makeStatement,makeIdent,makeDString,makeSString |
| 52 | + syn region makeIdent start="\${" skip="\\}\|\\\\" end="}" contains=makeStatement,makeIdent,makeDString,makeSString |
| 53 | + syn region makeIdent start="\$\$(" skip="\\)\|\\\\" end=")" containedin=makeDefine contains=makeStatement,makeIdent,makeDString,makeSString |
| 54 | + syn region makeIdent start="\$\${" skip="\\}\|\\\\" end="}" containedin=makeDefine contains=makeStatement,makeIdent,makeDString,makeSString |
54 | 55 | endif |
55 | 56 | syn match makeIdent "^ *[^:#= \t]*\s*[:+?!*]="me=e-2 |
56 | 57 | syn match makeIdent "^ *[^:#= \t]*\s*::="me=e-3 |
|
0 commit comments