Skip to content

Commit 4f010c9

Browse files
dkearnschrisbra
authored andcommitted
runtime(vim): Update base-syntax, always match continuation comments to EOL
closes: #16630 Signed-off-by: Doug Kearns <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 8f3277f commit 4f010c9

12 files changed

Lines changed: 32 additions & 23 deletions

runtime/syntax/generator/vim.vim.base

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,8 +1115,8 @@ endif
11151115
syn match vimShebang "\%^#!.*" display
11161116

11171117
syn match vimContinue "^\s*\zs\\"
1118-
syn match vimContinueComment '^\s*\zs["#]\\ .*'
1119-
syn match vim9ContinueComment "^\s*\zs#\\ .*"
1118+
syn match vimContinueComment '^\s*\zs["#]\\ .*' extend
1119+
syn match vim9ContinueComment "^\s*\zs#\\ .*" extend
11201120
syn cluster vimContinue contains=vimContinue,vimContinueComment
11211121
syn cluster vim9Continue contains=vimContinue,vim9ContinueComment
11221122

runtime/syntax/testdir/dumps/vim_ex_syntax_02.dump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
| +0#e000002&@5|\+0#e000e06&|p+0#e000002&|a|t|3|a| |.|*| |p|a|t|3|b| +0#0000000&@53
1818
| +0#e000002&@5|"+0#0000e05&|\| |p|a|t@1|e|r|n| |e|n|d| +0#0000000&@54
1919
| +0#e000002&@5|\+0#e000e06&|/+0#e000002&| +0#0000000&@66
20-
@57|3|6|,|7| @9|1|8|%|
20+
@57|3|6|,|7| @9|1|7|%|

runtime/syntax/testdir/dumps/vim_ex_syntax_03.dump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
@6|"+0#0000e05&|\| |s|k|i|p|e|m|p|t|y| |o|p|t|i|o|n| +0#0000000&@49
1818
@6|\+0#e000e06&| +0#0000000&|s+0#e000e06&|k|i|p|e|m|p|t|y| +0#0000000&@57
1919
@6|"+0#0000e05&|\| |s|k|i|p|n|l| |o|p|t|i|o|n| +0#0000000&@52
20-
@57|5|4|,|7| @9|3|0|%|
20+
@57|5|4|,|7| @9|2|8|%|

runtime/syntax/testdir/dumps/vim_ex_syntax_04.dump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
@6|"+0#0000e05&|\| |O|P|T|I|O|N|S| +0#0000000&@58
1818
@6|"+0#0000e05&|\| |s|t|a|r|t| |o|p|t|i|o|n| +0#0000000&@53
1919
@6|\+0#e000e06&| +0#0000000&|s+0#00e0003&|t|a|r|t|=|"+0#e000002&|s|t|a|r|t|-|p|a|t@1|e|r|n|"| +0#0000000&@45
20-
@57|7|2|,|7| @9|4|1|%|
20+
@57|7|2|,|7| @9|3|9|%|

runtime/syntax/testdir/dumps/vim_ex_syntax_05.dump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
@6|\+0#e000e06&| +0#0000000&|t+0#e000e06&|r|a|n|s|p|a|r|e|n|t| +0#0000000&@55
1818
@6|"+0#0000e05&|\| |s|k|i|p|w|h|i|t|e| |o|p|t|i|o|n| +0#0000000&@49
1919
@6|\+0#e000e06&| +0#0000000&|s+0#e000e06&|k|i|p|w|h|i|t|e| +0#0000000&@57
20-
@57|9|0|,|7| @9|5|3|%|
20+
@57|9|0|,|7| @9|5|0|%|

runtime/syntax/testdir/dumps/vim_ex_syntax_06.dump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
@6|\+0#e000e06&| +0#0000000&|c+0#e000e06&|o|n|c|e|a|l|e|n|d|s| +0#0000000&@55
1818
@6|"+0#0000e05&|\| |e|x|c|l|u|d|e|n|l| |o|p|t|i|o|n| +0#0000000&@49
1919
@6|\+0#e000e06&| +0#0000000&|e+0#e000e06&|x|c|l|u|d|e|n|l| +0#0000000&@57
20-
@57|1|0|8|,|7| @8|6|4|%|
20+
@57|1|0|8|,|7| @8|6|1|%|

runtime/syntax/testdir/dumps/vim_ex_syntax_07.dump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
@75
1818
|"+0#0000e05&| |m|u|l|t|i|l|i|n|e| |g|r|o|u|p| |l|i|s|t| +0#0000000&@52
1919
@75
20-
@57|1|2|6|,|7| @8|7|5|%|
20+
@57|1|2|6|,|7| @8|7|1|%|

runtime/syntax/testdir/dumps/vim_ex_syntax_08.dump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
@6|\+0#e000e06&| +0#0000000&|t|e|s|t|N|e|x|t|0| |,| |t|e|s|t|N|e|x|t|1| |,| @43
1818
@6|"+0#0000e05&|\| |a| |c|o|m@1|e|n|t| +0#0000000&@56
1919
@6|\+0#e000e06&| +0#0000000&|t|e|s|t|N|e|x|t|[|2|-|8|]|.|*| |,| @49
20-
@57|1|4@1|,|1| @8|8|7|%|
20+
@57|1|4@1|,|1| @8|8|2|%|

runtime/syntax/testdir/dumps/vim_ex_syntax_09.dump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
@2|f+0#af5f00255&|o|r| +0#0000000&|c+0#00e0e07&|l|u|s|t|e|r| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|[+0#e000e06&|'+0#e000002&|m|a|r|k|d|o|w|n|H|i|g|h|l|i|g|h|t|_|z|s|h|'|,+0#0000000&| |'+0#e000002&|z|s|h|'|]+0#e000e06&| +0#0000000&@25
1818
@4|"+0#0000e05&| |.@2| +0#0000000&@65
1919
@2|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@66
20-
@57|1|6|2|,|7| @8|9|8|%|
20+
@57|1|6|2|,|7| @8|9|3|%|
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
| +0&#ffffff0@1|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@66
22
@2|"+0#0000e05&| |.@2| +0#0000000&@67
3-
>e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
3+
|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
4+
@75
5+
|"+0#0000e05&| |e|a|r|l|y| |t|e|r|m|i|n|a|t|i|o|n| |o|f| |v|i|m|S|y|n|R|e|g|i|o|n| +0#0000000&@39
6+
> @74
7+
|s+0#af5f00255&|y|n| +0#0000000&|r+0#00e0003&|e|g|i|o|n| +0#0000000&|t+0#00e0003&|e|s|t|R|e|g|i|o|n| +0#0000000&@53
8+
@6|"+0#0000e05&|\| ||| |d|o|e|s| |n|o|t| |e|n|d| |t|h|e| |a|r|g|s| |r|e|g|i|o|n| +0#0000000&@35
9+
@6|"+0#0000e05&|\| |s|t|a|r|t|=|"|f|o@1|\|||b|a|r|"| +0#0000000&@49
10+
@6|\+0#e000e06&| +0#0000000&|s+0#00e0003&|t|a|r|t|=|"+0#e000002&|s|t|a|r|t|"| +0#0000000&@53
11+
@6|\+0#e000e06&| +0#0000000&|e+0#00e0003&|n|d|=|"+0#e000002&|e|n|d|"| +0#0000000&@57
12+
@75
413
|~+0#4040ff13&| @73
514
|~| @73
615
|~| @73
716
|~| @73
817
|~| @73
918
|~| @73
1019
|~| @73
11-
|~| @73
12-
|~| @73
13-
|~| @73
14-
|~| @73
15-
|~| @73
16-
|~| @73
17-
|~| @73
18-
|~| @73
19-
|~| @73
20-
| +0#0000000&@56|1|7@1|,|1| @8|B|o|t|
20+
| +0#0000000&@56|1|8|0|,|0|-|1| @6|B|o|t|

0 commit comments

Comments
 (0)