From d817609b87fd155e0d71c29ed056effdedbd7ee0 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Sat, 31 Aug 2024 16:57:32 +0200 Subject: [PATCH] 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 Signed-off-by: Doug Kearns Signed-off-by: Christian Brabandt --- runtime/syntax/generator/vim.vim.base | 6 +++--- .../syntax/testdir/dumps/vim_ex_range_00.dump | 20 +++++++++++++++++++ runtime/syntax/testdir/input/vim_ex_range.vim | 6 ++++++ runtime/syntax/vim.vim | 6 +++--- 4 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 runtime/syntax/testdir/dumps/vim_ex_range_00.dump create mode 100644 runtime/syntax/testdir/input/vim_ex_range.vim diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base index 2624798a5a..03812087ec 100644 --- a/runtime/syntax/generator/vim.vim.base +++ b/runtime/syntax/generator/vim.vim.base @@ -3,7 +3,7 @@ " Maintainer: Hirohito Higashi " Doug Kearns " 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 "\"+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 0000000000..3383702c2c --- /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 2fa2e35dbd..e290a70921 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -3,7 +3,7 @@ " Maintainer: Hirohito Higashi " Doug Kearns " 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 "\