runtime(vim): remove trailing whitespace in Vim syntax generator
Commit:
https://github.com/vim/vim/commit/6acca4bc59471c38edf9d5303bd20905a1d4e4f2
Author: Eisuke Kawashima <e-k...@users.noreply.github.com>
Date: Sat Jun 7 17:55:58 2025 +0200
runtime(vim): remove trailing whitespace in Vim syntax generator
related: https://github.com/vim/vim/issues/17450
Signed-off-by: Eisuke Kawashima <e-k...@users.noreply.github.com>
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 b381be67f..d5a52f055 100644
--- a/runtime/syntax/generator/vim.vim.base
+++ b/runtime/syntax/generator/vim.vim.base
@@ -2,7 +2,7 @@
" Language: Vim script
" Maintainer: Hirohito Higashi <h.east.727 ATMARK gmail.com>
" Doug Kearns <dougkea...@gmail.com>
-" Last Change: 2025 Jun 05
+" Last Change: 2025 Jun 07
" Former Maintainer: Charles E. Campbell
" DO NOT CHANGE DIRECTLY.
@@ -337,7 +337,7 @@ if s:vim9script
\|
\%(^\s*#.*\)\@<=$
\|
- \n\s*\\|
\s*#\
+ \n\s*\\|
\s*#\
\+
\ matchgroup=vimCommand
\ end="\s\+\zsas\ze\s\+\h"
@@ -384,7 +384,7 @@ syn match vimAugroupBang contained " \@1<=!"
skipwhite nextgroup=vimAugroupName
syn keyword vimAugroupKey contained aug[roup] skipwhite
nextgroup=vimAugroupBang,vimAugroupName,vimAugroupEnd
" remove
-syn match vimAugroup "\<aug\%[roup]!" skipwhite
nextgroup=vimAugroupName contains=vimAugroupKey,vimAugroupBang
+syn match vimAugroup "\<aug\%[roup]!" skipwhite
nextgroup=vimAugroupName contains=vimAugroupKey,vimAugroupBang
" list
VimL syn match vimAugroup "\<aug\%[roup]\>\ze\s*\%(["|]\|$\)"
skipwhite nextgroup=vimCmdSep,vimComment contains=vimAugroupKey
@@ -1060,7 +1060,7 @@ syn match vimWildcardBracketEquivalenceClass
contained "\[=[^=]\+=]" nextgroup=@
syn match vimWildcardBracketCollatingSymbol contained
"\[\.[^.]\+\.]" nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketEnd
syn match vimWildcardBracketStart contained "\["
nextgroup=vimWildcardBracketCaret,vimWildcardBracketRightBracket,@vimWildcardBracketCharacter
-syn match vimWildcardBracketCaret contained "\^"
nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketRightBracket
+syn match vimWildcardBracketCaret contained "\^"
nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketRightBracket
syn match vimWildcardBracketEnd contained "]"
syn cluster vimWildcardBracketCharacter
contains=vimWildcardBracketCharacter,vimWildcardBracketEscape,vimWildcardBracketCharacterClass,vimWildcardBracketEquivalenceClass,vimWildcardBracketCollatingSymbol
@@ -1137,7 +1137,7 @@ syn region vimExecute matchgroup=vimCommand
start="\<exe\%[cute]\>" skip=+\|\|\
syn match vimExFilter "\<filt\%[er]\>" skipwhite
nextgroup=vimExFilterBang,vimExFilterPattern
syn match vimExFilterBang contained " \@1<=!" skipwhite
nextgroup=vimExFilterPattern
syn region vimExFilterPattern contained
- \ start="[[:ident:]]"
+ \ start="[[:ident:]]"
\ end="\ze[[:space:]
]"
\ skipwhite nextgroup=@vimCmdList
\ contains=@vimSubstList
@@ -1194,7 +1194,7 @@ syn match vimVimgrep "\<l\=vim\%[grep]\>"
skipwhite nextgroup=vimVimgrepBang,vi
syn match vimVimgrepadd "\<l\=vimgrepa\%[dd]\>" skipwhite
nextgroup=vimVimgrepBang,vimVimgrepPattern
syn match vimVimgrepBang contained " \@1<=!"
skipwhite nextgroup=vimVimgrepPattern
syn region vimVimgrepPattern contained
- \ start="[[:ident:]]"
+ \ start="[[:ident:]]"
\ end="\ze[[:space:]
]"
\ skipwhite nextgroup=vimVimgrepFile,vimCmdSep
\ contains=@vimSubstList
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 18c5e9eb6..3eafe1e7a 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -2,7 +2,7 @@
" Language: Vim script
" Maintainer: Hirohito Higashi <h.east.727 ATMARK gmail.com>
" Doug Kearns <dougkea...@gmail.com>
-" Last Change: 2025 Jun 05
+" Last Change: 2025 Jun 07
" Former Maintainer: Charles E. Campbell
" DO NOT CHANGE DIRECTLY.
@@ -390,7 +390,7 @@ if s:vim9script
\|
\%(^\s*#.*\)\@<=$
\|
- \n\s*\\|
\s*#\
+ \n\s*\\|
\s*#\
\+
\ matchgroup=vimCommand
\ end="\s\+\zsas\ze\s\+\h"
@@ -437,7 +437,7 @@ syn match vimAugroupBang contained " \@1<=!"
skipwhite nextgroup=vimAugroupName
syn keyword vimAugroupKey contained aug[roup] skipwhite
nextgroup=vimAugroupBang,vimAugroupName,vimAugroupEnd
" remove
-syn match vimAugroup "\<aug\%[roup]!" skipwhite
nextgroup=vimAugroupName contains=vimAugroupKey,vimAugroupBang
+syn match vimAugroup "\<aug\%[roup]!" skipwhite
nextgroup=vimAugroupName contains=vimAugroupKey,vimAugroupBang
" list
VimL syn match vimAugroup "\<aug\%[roup]\>\ze\s*\%(["|]\|$\)"
skipwhite nextgroup=vimCmdSep,vimComment contains=vimAugroupKey
@@ -1117,7 +1117,7 @@ syn match vimWildcardBracketEquivalenceClass
contained "\[=[^=]\+=]" nextgroup=@
syn match vimWildcardBracketCollatingSymbol contained
"\[\.[^.]\+\.]" nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketEnd
syn match vimWildcardBracketStart contained "\["
nextgroup=vimWildcardBracketCaret,vimWildcardBracketRightBracket,@vimWildcardBracketCharacter
-syn match vimWildcardBracketCaret contained "\^"
nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketRightBracket
+syn match vimWildcardBracketCaret contained "\^"
nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketRightBracket
syn match vimWildcardBracketEnd contained "]"
syn cluster vimWildcardBracketCharacter
contains=vimWildcardBracketCharacter,vimWildcardBracketEscape,vimWildcardBracketCharacterClass,vimWildcardBracketEquivalenceClass,vimWildcardBracketCollatingSymbol
@@ -1194,7 +1194,7 @@ syn region vimExecute matchgroup=vimCommand
start="\<exe\%[cute]\>" skip=+\|\|\
syn match vimExFilter "\<filt\%[er]\>" skipwhite
nextgroup=vimExFilterBang,vimExFilterPattern
syn match vimExFilterBang contained " \@1<=!" skipwhite
nextgroup=vimExFilterPattern
syn region vimExFilterPattern contained
- \ start="[[:ident:]]"
+ \ start="[[:ident:]]"
\ end="\ze[[:space:]
]"
\ skipwhite nextgroup=@vimCmdList
\ contains=@vimSubstList
@@ -1251,7 +1251,7 @@ syn match vimVimgrep "\<l\=vim\%[grep]\>"
skipwhite nextgroup=vimVimgrepBang,vi
syn match vimVimgrepadd "\<l\=vimgrepa\%[dd]\>" skipwhite
nextgroup=vimVimgrepBang,vimVimgrepPattern
syn match vimVimgrepBang contained " \@1<=!"
skipwhite nextgroup=vimVimgrepPattern
syn region vimVimgrepPattern contained
- \ start="[[:ident:]]"
+ \ start="[[:ident:]]"
\ end="\ze[[:space:]
]"
\ skipwhite nextgroup=vimVimgrepFile,vimCmdSep
\ contains=@vimSubstList
--
--
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/E1uNwCG-005hlA-2C%40256bit.org.
