From 6acca4bc59471c38edf9d5303bd20905a1d4e4f2 Mon Sep 17 00:00:00 2001 From: Eisuke Kawashima Date: Sat, 7 Jun 2025 17:55:58 +0200 Subject: [PATCH] runtime(vim): remove trailing whitespace in Vim syntax generator related: #17450 Signed-off-by: Eisuke Kawashima Signed-off-by: Doug Kearns Signed-off-by: Christian Brabandt --- runtime/syntax/generator/vim.vim.base | 12 ++++++------ runtime/syntax/vim.vim | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base index b381be67f5..d5a52f055a 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 " Doug Kearns -" 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*\\\|\n\s*#\\ + \\n\s*\\\|\n\s*#\\ \+ \ matchgroup=vimCommand \ end="\s\+\zsas\ze\s\+\h" @@ -384,7 +384,7 @@ syn match vimAugroupBang contained "\a\@1<=!" skipwhite nextgroup=vimAugroupName syn keyword vimAugroupKey contained aug[roup] skipwhite nextgroup=vimAugroupBang,vimAugroupName,vimAugroupEnd " remove -syn match vimAugroup "\\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="\" skip=+\\|\|\ syn match vimExFilter "\" skipwhite nextgroup=vimExFilterBang,vimExFilterPattern syn match vimExFilterBang contained "\a\@1<=!" skipwhite nextgroup=vimExFilterPattern syn region vimExFilterPattern contained - \ start="[[:ident:]]" + \ start="[[:ident:]]" \ end="\ze[[:space:]\n]" \ skipwhite nextgroup=@vimCmdList \ contains=@vimSubstList @@ -1194,7 +1194,7 @@ syn match vimVimgrep "\" skipwhite nextgroup=vimVimgrepBang,vi syn match vimVimgrepadd "\" skipwhite nextgroup=vimVimgrepBang,vimVimgrepPattern syn match vimVimgrepBang contained "\a\@1<=!" skipwhite nextgroup=vimVimgrepPattern syn region vimVimgrepPattern contained - \ start="[[:ident:]]" + \ start="[[:ident:]]" \ end="\ze[[:space:]\n]" \ skipwhite nextgroup=vimVimgrepFile,vimCmdSep \ contains=@vimSubstList diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 18c5e9eb60..3eafe1e7af 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -2,7 +2,7 @@ " Language: Vim script " Maintainer: Hirohito Higashi " Doug Kearns -" 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*\\\|\n\s*#\\ + \\n\s*\\\|\n\s*#\\ \+ \ matchgroup=vimCommand \ end="\s\+\zsas\ze\s\+\h" @@ -437,7 +437,7 @@ syn match vimAugroupBang contained "\a\@1<=!" skipwhite nextgroup=vimAugroupName syn keyword vimAugroupKey contained aug[roup] skipwhite nextgroup=vimAugroupBang,vimAugroupName,vimAugroupEnd " remove -syn match vimAugroup "\\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="\" skip=+\\|\|\ syn match vimExFilter "\" skipwhite nextgroup=vimExFilterBang,vimExFilterPattern syn match vimExFilterBang contained "\a\@1<=!" skipwhite nextgroup=vimExFilterPattern syn region vimExFilterPattern contained - \ start="[[:ident:]]" + \ start="[[:ident:]]" \ end="\ze[[:space:]\n]" \ skipwhite nextgroup=@vimCmdList \ contains=@vimSubstList @@ -1251,7 +1251,7 @@ syn match vimVimgrep "\" skipwhite nextgroup=vimVimgrepBang,vi syn match vimVimgrepadd "\" skipwhite nextgroup=vimVimgrepBang,vimVimgrepPattern syn match vimVimgrepBang contained "\a\@1<=!" skipwhite nextgroup=vimVimgrepPattern syn region vimVimgrepPattern contained - \ start="[[:ident:]]" + \ start="[[:ident:]]" \ end="\ze[[:space:]\n]" \ skipwhite nextgroup=vimVimgrepFile,vimCmdSep \ contains=@vimSubstList -- 2.39.5