runtime(vim): Update base-syntax, always match continuation comments to EOL
Commit: https://github.com/vim/vim/commit/4f010c90bdcb56a9c72cfee4d6fe3130b88616f8 Author: Doug Kearns <dougkea...@gmail.com> Date: Thu Feb 13 20:24:42 2025 +0100 runtime(vim): Update base-syntax, always match continuation comments to EOL closes: https://github.com/vim/vim/issues/16630 Signed-off-by: Doug Kearns <dougkea...@gmail.com> Signed-off-by: Christian Brabandt <c...@256bit.org> diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base index ab63de6c7..d2ddd1c90 100644 --- 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 3ff2aba22..bcc59d488 100644 --- 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 59d9562a7..66ccef312 100644 --- 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 4022b4850..0cd153d56 100644 --- 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 c4c49948b..ff05fd1b5 100644 --- 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 6c5e4ce2e..05cfd6419 100644 --- 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 2f66e9855..d442dd291 100644 --- 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 db2d97b13..84862c7c3 100644 --- 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 f48fb0471..0b5e3d7ab 100644 --- 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 c33c08210..1627f394f 100644 --- 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 79437ffff..5611e6aaf 100644 --- 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 0d4082aac..8bb91e397 100644 --- 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 -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/vim_dev/E1tieuX-006z8N-9Q%40256bit.org.
