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 <habamax@gmail.com>
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 2624798a5a0e1f08e6952fc9b893aec7239d0abd..03812087ec89a61fb5e8eae529faeebe28fedf41 100644 (file)
--- 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 <dougkearns@gmail.com>
 " 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 (file)
index 0000000..2b0ad77
--- /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 (file)
index 0000000..3383702
--- /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 2fa2e35dbd2d7d49b8df3f2a8c9f75550cc3d668..e290a709216372e0430e18706681a9e474080633 100644 (file)
--- 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 <dougkearns@gmail.com>
 " 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