runtime(vim): Update base-syntax, always match continuation comments to EOL

closes: #16630

Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base
index ab63de6c77bf0f94730a9f29ca6f6f1b57f2960e..d2ddd1c90c12005a28aad2364d18ffb193f67881 100644 (file)
--- a/runtime/syntax/generator/vim.vim.base
+++ b/runtime/syntax/generator/vim.vim.base
@@ -1115,8 +1115,8 @@ endif
 syn match      vimShebang      "\%^#!.*" display
 
 syn match      vimContinue             "^\s*\zs\\"
-syn match         vimContinueComment   '^\s*\zs["#]\\ .*'
-syn match         vim9ContinueComment  "^\s*\zs#\\ .*"
+syn match      vimContinueComment      '^\s*\zs["#]\\ .*' extend
+syn match      vim9ContinueComment     "^\s*\zs#\\ .*"  extend
 syn cluster    vimContinue     contains=vimContinue,vimContinueComment
 syn cluster    vim9Continue    contains=vimContinue,vim9ContinueComment
 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_syntax_02.dump b/runtime/syntax/testdir/dumps/vim_ex_syntax_02.dump
index 3ff2aba2252ecf1cfff8d8ba28bce52f6f384fc7..bcc59d488d3ad286ffe60aed56ff04875cda5cf0 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_syntax_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_syntax_02.dump
@@ -17,4 +17,4 @@
 | +0#e000002&@5|\+0#e000e06&|p+0#e000002&|a|t|3|a| |.|*| |p|a|t|3|b| +0#0000000&@53
 | +0#e000002&@5|"+0#0000e05&|\| |p|a|t@1|e|r|n| |e|n|d| +0#0000000&@54
 | +0#e000002&@5|\+0#e000e06&|/+0#e000002&| +0#0000000&@66
-@57|3|6|,|7| @9|1|8|%| 
+@57|3|6|,|7| @9|1|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_syntax_03.dump b/runtime/syntax/testdir/dumps/vim_ex_syntax_03.dump
index 59d9562a776355ca3b57fbe6c9acff900603ed8e..66ccef31283dd57e666568aa5a457d5a5ba6367a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_syntax_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_syntax_03.dump
@@ -17,4 +17,4 @@
 @6|"+0#0000e05&|\| |s|k|i|p|e|m|p|t|y| |o|p|t|i|o|n| +0#0000000&@49
 @6|\+0#e000e06&| +0#0000000&|s+0#e000e06&|k|i|p|e|m|p|t|y| +0#0000000&@57
 @6|"+0#0000e05&|\| |s|k|i|p|n|l| |o|p|t|i|o|n| +0#0000000&@52
-@57|5|4|,|7| @9|3|0|%| 
+@57|5|4|,|7| @9|2|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_syntax_04.dump b/runtime/syntax/testdir/dumps/vim_ex_syntax_04.dump
index 4022b48501604c69d683b0f7a653271561051823..0cd153d562bfa9e8d35691638aa989bb93e61add 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_syntax_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_syntax_04.dump
@@ -17,4 +17,4 @@
 @6|"+0#0000e05&|\| |O|P|T|I|O|N|S| +0#0000000&@58
 @6|"+0#0000e05&|\| |s|t|a|r|t| |o|p|t|i|o|n| +0#0000000&@53
 @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
-@57|7|2|,|7| @9|4|1|%| 
+@57|7|2|,|7| @9|3|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_syntax_05.dump b/runtime/syntax/testdir/dumps/vim_ex_syntax_05.dump
index c4c49948bcc8a64fa0340b20fe9287ae05e759da..ff05fd1b501c610cb92f645080585d0e8663a9e4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_syntax_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_syntax_05.dump
@@ -17,4 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|t+0#e000e06&|r|a|n|s|p|a|r|e|n|t| +0#0000000&@55
 @6|"+0#0000e05&|\| |s|k|i|p|w|h|i|t|e| |o|p|t|i|o|n| +0#0000000&@49
 @6|\+0#e000e06&| +0#0000000&|s+0#e000e06&|k|i|p|w|h|i|t|e| +0#0000000&@57
-@57|9|0|,|7| @9|5|3|%| 
+@57|9|0|,|7| @9|5|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_syntax_06.dump b/runtime/syntax/testdir/dumps/vim_ex_syntax_06.dump
index 6c5e4ce2ec3f2f91ccca538700a056057cb8cecb..05cfd6419f0254ed779fada0ab99970a0977dbe5 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_syntax_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_syntax_06.dump
@@ -17,4 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|c+0#e000e06&|o|n|c|e|a|l|e|n|d|s| +0#0000000&@55
 @6|"+0#0000e05&|\| |e|x|c|l|u|d|e|n|l| |o|p|t|i|o|n| +0#0000000&@49
 @6|\+0#e000e06&| +0#0000000&|e+0#e000e06&|x|c|l|u|d|e|n|l| +0#0000000&@57
-@57|1|0|8|,|7| @8|6|4|%| 
+@57|1|0|8|,|7| @8|6|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_syntax_07.dump b/runtime/syntax/testdir/dumps/vim_ex_syntax_07.dump
index 2f66e98550fee33d5441a083babcf12dc39ccb00..d442dd2910a68b684f320dd0f833ab7639b03daf 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_syntax_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_syntax_07.dump
@@ -17,4 +17,4 @@
 @75
 |"+0#0000e05&| |m|u|l|t|i|l|i|n|e| |g|r|o|u|p| |l|i|s|t| +0#0000000&@52
 @75
-@57|1|2|6|,|7| @8|7|5|%| 
+@57|1|2|6|,|7| @8|7|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_syntax_08.dump b/runtime/syntax/testdir/dumps/vim_ex_syntax_08.dump
index db2d97b13a54d335f1343175dee058e8acb31f41..84862c7c351068794a0e3825a52172f4c8ecf666 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_syntax_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_syntax_08.dump
@@ -17,4 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|t|e|s|t|N|e|x|t|0| |,| |t|e|s|t|N|e|x|t|1| |,| @43
 @6|"+0#0000e05&|\| |a| |c|o|m@1|e|n|t| +0#0000000&@56
 @6|\+0#e000e06&| +0#0000000&|t|e|s|t|N|e|x|t|[|2|-|8|]|.|*| |,| @49
-@57|1|4@1|,|1| @8|8|7|%| 
+@57|1|4@1|,|1| @8|8|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_syntax_09.dump b/runtime/syntax/testdir/dumps/vim_ex_syntax_09.dump
index f48fb0471475b36e28cdec4fe2d713bb1a9b9a56..0b5e3d7ab5b4a80dade026b596dabff7ec02189d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_syntax_09.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_syntax_09.dump
@@ -17,4 +17,4 @@
 @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
 @4|"+0#0000e05&| |.@2| +0#0000000&@65
 @2|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@66
-@57|1|6|2|,|7| @8|9|8|%| 
+@57|1|6|2|,|7| @8|9|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_syntax_10.dump b/runtime/syntax/testdir/dumps/vim_ex_syntax_10.dump
index c33c08210b1173eb9a13a9b0912ea9a034648aed..1627f394fbcb1f11767b293aa4cdeff0dfa533af 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_syntax_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_syntax_10.dump
@@ -1,6 +1,15 @@
 | +0&#ffffff0@1|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@66
 @2|"+0#0000e05&| |.@2| +0#0000000&@67
->e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
+|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
+@75
+|"+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
+> @74
+|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
+@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
+@6|"+0#0000e05&|\| |s|t|a|r|t|=|"|f|o@1|\|||b|a|r|"| +0#0000000&@49
+@6|\+0#e000e06&| +0#0000000&|s+0#00e0003&|t|a|r|t|=|"+0#e000002&|s|t|a|r|t|"| +0#0000000&@53
+@6|\+0#e000e06&| +0#0000000&|e+0#00e0003&|n|d|=|"+0#e000002&|e|n|d|"| +0#0000000&@57
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -8,13 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|7@1|,|1| @8|B|o|t| 
+| +0#0000000&@56|1|8|0|,|0|-|1| @6|B|o|t| 

diff --git a/runtime/syntax/testdir/input/vim_ex_syntax.vim b/runtime/syntax/testdir/input/vim_ex_syntax.vim
index 79437ffff5983e8a6468bf15743db11fdd9beee7..5611e6aaf4628332adaf09728f3cfe0d38da2271 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_syntax.vim
+++ b/runtime/syntax/testdir/input/vim_ex_syntax.vim
@@ -175,3 +175,12 @@ function! s:ContainedGroup()
   endfor
   " ...
 endfunction
+
+" early termination of vimSynRegion
+
+syn region testRegion
+      "\ | does not end the args region
+      "\ start="foo\|bar"
+      \ start="start"
+      \ end="end"
+

diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 0d4082aac6760fef485b94fdb7578f77d07abc11..8bb91e3979a4add00ce05aa21496f6d3e2d5b5b6 100644 (file)
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1161,8 +1161,8 @@ endif
 syn match      vimShebang      "\%^#!.*" display
 
 syn match      vimContinue             "^\s*\zs\\"
-syn match         vimContinueComment   '^\s*\zs["#]\\ .*'
-syn match         vim9ContinueComment  "^\s*\zs#\\ .*"
+syn match      vimContinueComment      '^\s*\zs["#]\\ .*' extend
+syn match      vim9ContinueComment     "^\s*\zs#\\ .*"  extend
 syn cluster    vimContinue     contains=vimContinue,vimContinueComment
 syn cluster    vim9Continue    contains=vimContinue,vim9ContinueComment