runtime(vim): Update base-syntax, match bracket mark ranges
Commit:
https://github.com/vim/vim/commit/d817609b87fd155e0d71c29ed056effdedbd7ee0
Author: Doug Kearns <[email protected]>
Date: Sat Aug 31 16:57:32 2024 +0200
runtime(vim): Update base-syntax, match bracket mark ranges
Match '(,'),'[,'],'{, and '} marks in Ex command ranges.
Thanks to Maxim Kim.
Fixes #15332.
Closes #15337.
Signed-off-by: Maxim Kim <[email protected]>
Signed-off-by: Doug Kearns <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/syntax/generator/vim.vim.base
b/runtime/syntax/generator/vim.vim.base
index 2624798a5..03812087e 100644
--- a/runtime/syntax/generator/vim.vim.base
+++ b/runtime/syntax/generator/vim.vim.base
@@ -3,7 +3,7 @@
" Maintainer: Hirohito Higashi <h.east.727 ATMARK gmail.com>
" Doug Kearns <[email protected]>
" URL: https://github.com/vim-jp/syntax-vim-ex
-" Last Change: 2024 Aug 23
+" Last Change: 2024 Aug 30
" Former Maintainer: Charles E. Campbell
" DO NOT CHANGE DIRECTLY.
@@ -478,8 +478,8 @@ syn match vimString "[^(,]'[^']\{-}\zs'"
" Marks, Registers, Addresses, Filters: {{{2
syn match vimMark "'[a-zA-Z0-9]\ze[-+,!]"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
-syn match vimMark "'[<>]\ze[-+,!]"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
-syn match vimMark ",\zs'[<>]\ze"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
+syn match vimMark "'[[\]{}()<>]\ze[-+,!]"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
+syn match vimMark ",\zs'[[\]{}()<>]\ze"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
syn match vimMark "[!,:]\zs'[a-zA-Z0-9]"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
syn match vimMark "\<norm\%[al]\s\zs'[a-zA-Z0-9]"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
syn match vimMarkNumber "[-+]\d\+" contained
contains=vimOper nextgroup=vimSubst1
diff --git a/runtime/syntax/testdir/dumps/vim_ex_range_00.dump
b/runtime/syntax/testdir/dumps/vim_ex_range_00.dump
new file mode 100644
index 000000000..2b0ad770e
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_ex_range_00.dump
@@ -0,0 +1,20 @@
+>"+0#0000e05#ffffff0| |E|x| |c|o|m@1|a|n|d| |r|a|n|g|e|s| +0#0000000&@55
+@75
+|'+0#e000002&|<|,+0#0000000&|'+0#e000002&|>|p+0#af5f00255&|r|i|n|t|
+0#0000000&@64
+|'+0#e000002&|(|,+0#0000000&|'+0#e000002&|)|p+0#af5f00255&|r|i|n|t|
+0#0000000&@64
+|'+0#e000002&|{|,+0#0000000&|'+0#e000002&|}|p+0#af5f00255&|r|i|n|t|
+0#0000000&@64
+|'+0#e000002&|[|,+0#0000000&|'+0#e000002&|]|p+0#af5f00255&|r|i|n|t|
+0#0000000&@64
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|,|1| @10|A|l@1|
diff --git a/runtime/syntax/testdir/input/vim_ex_range.vim
b/runtime/syntax/testdir/input/vim_ex_range.vim
new file mode 100644
index 000000000..3383702c2
--- /dev/null
+++ b/runtime/syntax/testdir/input/vim_ex_range.vim
@@ -0,0 +1,6 @@
+" Ex command ranges
+
+'<,'>print
+'(,')print
+'{,'}print
+'[,']print
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 2fa2e35db..e290a7092 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -3,7 +3,7 @@
" Maintainer: Hirohito Higashi <h.east.727 ATMARK gmail.com>
" Doug Kearns <[email protected]>
" URL: https://github.com/vim-jp/syntax-vim-ex
-" Last Change: 2024 Aug 23
+" Last Change: 2024 Aug 30
" Former Maintainer: Charles E. Campbell
" DO NOT CHANGE DIRECTLY.
@@ -517,8 +517,8 @@ syn match vimString "[^(,]'[^']\{-}\zs'"
" Marks, Registers, Addresses, Filters: {{{2
syn match vimMark "'[a-zA-Z0-9]\ze[-+,!]"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
-syn match vimMark "'[<>]\ze[-+,!]"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
-syn match vimMark ",\zs'[<>]\ze"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
+syn match vimMark "'[[\]{}()<>]\ze[-+,!]"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
+syn match vimMark ",\zs'[[\]{}()<>]\ze"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
syn match vimMark "[!,:]\zs'[a-zA-Z0-9]"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
syn match vimMark "\<norm\%[al]\s\zs'[a-zA-Z0-9]"
nextgroup=vimFilter,vimMarkNumber,vimSubst1
syn match vimMarkNumber "[-+]\d\+" contained
contains=vimOper nextgroup=vimSubst1
--
--
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 [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1skPa6-002aZu-OM%40256bit.org.
