From: Doug Kearns Date: Sun, 30 Nov 2025 15:44:36 +0000 (+0000) Subject: runtime(vim): Update base syntax, match full :language command X-Git-Tag: v9.1.1943~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4c43a6cf54b1916339641439b74f05499a4d9dd;p=thirdparty%2Fvim.git runtime(vim): Update base syntax, match full :language command closes: #18808 Signed-off-by: Doug Kearns Signed-off-by: Christian Brabandt --- diff --git a/runtime/syntax/generator/gen_syntax_vim.vim b/runtime/syntax/generator/gen_syntax_vim.vim index d0f6faba11..1125cbc132 100644 --- a/runtime/syntax/generator/gen_syntax_vim.vim +++ b/runtime/syntax/generator/gen_syntax_vim.vim @@ -1,7 +1,7 @@ " Vim syntax file generator " Language: Vim script " Maintainer: Hirohito Higashi (h_east) -" Last Change: 2025 Nov 26 +" Last Change: 2025 Nov 29 let s:keepcpo= &cpo set cpo&vim @@ -370,6 +370,7 @@ function s:get_vim_command_type(cmd_name) insert join k + language let ldo lfdo diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base index 007c87dca8..9f0c0bcc3a 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 Nov 21 +" Last Change: 2025 Nov 29 " Former Maintainer: Charles E. Campbell " DO NOT CHANGE DIRECTLY. @@ -246,7 +246,7 @@ syn match vimNumber '\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*' skipwhite nextgroup=@vi syn case match " All vimCommands are contained by vimIsCommand. {{{2 -syn cluster vimCmdList contains=vimAbb,vimAddress,vimAt,vimAutocmd,vimAugroup,vimBehave,vimBreakadd,vimBreakdel,vimBreaklist,vimCall,vimCatch,vimCd,vimCommandModifier,vimConst,vimDoautocmd,vimDebug,vimDebuggreedy,vimDef,vimDefFold,vimDefer,vimDelcommand,vimDelFunction,vimDoCommand,@vimEcho,vimElse,vimEnddef,vimEndfunction,vimEndif,vimEval,vimExecute,vimIsCommand,vimExtCmd,vimExFilter,vimExMark,vimFiletype,vimFor,vimFunction,vimFunctionFold,vimGrep,vimGrepAdd,vimGlobal,vimHelpgrep,vimHighlight,vimHistory,vimImport,vimLet,vimLoadkeymap,vimLockvar,vimMake,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimProfdel,vimProfile,vimPrompt,vimRedir,vimSet,vimSleep,vimSort,vimSyntax,vimSyntime,vimSynColor,vimSynLink,vimTerminal,vimThrow,vimUniq,vimUnlet,vimUnlockvar,vimUnmap,vimUserCmd,vimVimgrep,vimVimgrepadd,vimWincmd,vimMenu,vimMenutranslate,@vim9CmdList,@vimExUserCmdList,vimLua,vimMzScheme,vimPerl,vimPython,vimPython3,vimPythonX,vimRuby,vimTcl +syn cluster vimCmdList contains=vimAbb,vimAddress,vimAt,vimAutocmd,vimAugroup,vimBehave,vimBreakadd,vimBreakdel,vimBreaklist,vimCall,vimCatch,vimCd,vimCommandModifier,vimConst,vimDoautocmd,vimDebug,vimDebuggreedy,vimDef,vimDefFold,vimDefer,vimDelcommand,vimDelFunction,vimDoCommand,@vimEcho,vimElse,vimEnddef,vimEndfunction,vimEndif,vimEval,vimExecute,vimIsCommand,vimExtCmd,vimExFilter,vimExMark,vimFiletype,vimFor,vimFunction,vimFunctionFold,vimGrep,vimGrepAdd,vimGlobal,vimHelpgrep,vimHighlight,vimHistory,vimImport,vimLanguage,vimLet,vimLoadkeymap,vimLockvar,vimMake,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimProfdel,vimProfile,vimPrompt,vimRedir,vimSet,vimSleep,vimSort,vimSyntax,vimSyntime,vimSynColor,vimSynLink,vimTerminal,vimThrow,vimUniq,vimUnlet,vimUnlockvar,vimUnmap,vimUserCmd,vimVimgrep,vimVimgrepadd,vimWincmd,vimMenu,vimMenutranslate,@vim9CmdList,@vimExUserCmdList,vimLua,vimMzScheme,vimPerl,vimPython,vimPython3,vimPythonX,vimRuby,vimTcl syn cluster vim9CmdList contains=vim9Abstract,vim9Class,vim9Const,vim9Enum,vim9Export,vim9Final,vim9For,vim9Interface,vim9Type,vim9Var syn match vimCmdSep "\\\@1" skipwhite nextgroup=@vimComment syn match vimImport "\" skipwhite nextgroup=vimImportAutoload,vimImportFilename +" Language {{{2 +" ======== +syn keyword vimLanguage lan[guage] skipwhite nextgroup=@vimLanguageName,vimLanguageCategory,vimSep,vimComment,vim9Comment +syn keyword vimLanguageCategory contained col[late] cty[pe] mes[sages] tim[e] skipwhite nextgroup=@vimLanguageName + +" [language[_territory][.codeset][@modifier]] and the reserved "C" and "POSIX" +syn match vimLanguageName contained "[[:alnum:]][[:alnum:]._@-]*[[:alnum:]]" nextgroup=vimSep,vimComment,vim9Comment +syn keyword vimLanguageNameReserved contained C POSIX nextgroup=vimSep,vimComment,vim9Comment +syn cluster vimLanguageName contains=vimLanguageName,vimLanguageNameReserved + " Augroup : vimAugroupError removed because long augroups caused sync'ing problems. {{{2 " ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking. syn cluster vimAugroupList contains=@vimCmdList,vimFilter,@vimFunc,vimLineComment,vimSpecFile,vimOper,vimNumber,vimOperParen,@vimComment,vimString,vimSubst,vimRegister,vimCmplxRepeat,vimNotation,vimCtrlChar,vimContinue @@ -2534,6 +2544,9 @@ if !exists("skip_vim_syntax_inits") hi def link vimKeymapTailComment vimComment hi def link vimLambdaBrace Delimiter hi def link vimLambdaOperator vimOper + hi def link vimLanguage vimCommand + hi def link vimLanguageCategory Special + hi def link vimLanguageNameReserved Constant hi def link vimLet vimCommand hi def link vimLetHeredoc vimString hi def link vimLetHeredocStart Special diff --git a/runtime/syntax/testdir/dumps/vim_ex_language_00.dump b/runtime/syntax/testdir/dumps/vim_ex_language_00.dump new file mode 100644 index 0000000000..9209db3283 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_language_00.dump @@ -0,0 +1,20 @@ +>"+0#0000e05#ffffff0| |V|i|m| |:|l|a|n|g|u|a|g|e| |c|o|m@1|a|n|d| +0#0000000&@51 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|L|a|n|g|u|a|g|e|N|a|m|e| |T|o|d|o| +0#0000000&@29 +@75 +@75 +|"+0#0000e05&| |p|r|i|n|t| |c|o|m@1|a|n|d|s| +0#0000000&@58 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@66 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@58 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@60 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@61 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&@57 +@75 +@75 +|"+0#0000e05&| |s|e|t| |c|o|m@1|a|n|d|s| +0#0000000&@60 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|C+0#e000002&| +0#0000000&@55 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|C+0#e000002&| +0#0000000&@55 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|C+0#e000002&| +0#0000000&@55 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|C+0#e000002&| +0#0000000&@55 +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_language_01.dump b/runtime/syntax/testdir/dumps/vim_ex_language_01.dump new file mode 100644 index 0000000000..9b9054d2c1 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_language_01.dump @@ -0,0 +1,20 @@ +|"+0#0000e05#ffffff0| |s|e|t| |c|o|m@1|a|n|d|s| +0#0000000&@60 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|C+0#e000002&| +0#0000000&@55 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|C+0#e000002&| +0#0000000&@55 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|C+0#e000002&| +0#0000000&@55 +>l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|C+0#e000002&| +0#0000000&@55 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|C+0#e000002&| +0#0000000&@55 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|P+0#e000002&|O|S|I|X| +0#0000000&@51 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|P+0#e000002&|O|S|I|X| +0#0000000&@51 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|P+0#e000002&|O|S|I|X| +0#0000000&@51 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|P+0#e000002&|O|S|I|X| +0#0000000&@51 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|P+0#e000002&|O|S|I|X| +0#0000000&@51 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0@40 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0@40 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0@40 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0@40 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0@40 +@57|1|9|,|1| @10|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_language_02.dump b/runtime/syntax/testdir/dumps/vim_ex_language_02.dump new file mode 100644 index 0000000000..704b3e6cea --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_language_02.dump @@ -0,0 +1,20 @@ +|l+0#af5f00255#ffffff0|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0@40 +@75 +|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| |a|n|d| |t|r|a|i|l|i|n|g| |b|a|r| +0#0000000&@43 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47 +>l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|C+0#e000002&| +0#0000000&@15|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|C+0#e000002&| +0#0000000&@15|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|C+0#e000002&| +0#0000000&@15|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +@57|3|7|,|1| @9|2|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_language_03.dump b/runtime/syntax/testdir/dumps/vim_ex_language_03.dump new file mode 100644 index 0000000000..d291e9b7a1 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_language_03.dump @@ -0,0 +1,20 @@ +|l+0#af5f00255#ffffff0|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|C+0#e000002&| +0#0000000&@15|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|C+0#e000002&| +0#0000000&@15|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|C+0#e000002&| +0#0000000&@15|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|P+0#e000002&|O|S|I|X| +0#0000000&@11|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +>l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|P+0#e000002&|O|S|I|X| +0#0000000&@11|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|P+0#e000002&|O|S|I|X| +0#0000000&@11|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|P+0#e000002&|O|S|I|X| +0#0000000&@11|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|P+0#e000002&|O|S|I|X| +0#0000000&@11|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@30 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@44 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@44 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@44 +@57|5@1|,|1| @9|3|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_language_04.dump b/runtime/syntax/testdir/dumps/vim_ex_language_04.dump new file mode 100644 index 0000000000..f32a38a764 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_language_04.dump @@ -0,0 +1,20 @@ +|l+0#af5f00255#ffffff0|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@44 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@44 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@44 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|C+0#e000002&| +0#0000000&@15||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +>l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|C+0#e000002&| +0#0000000&@15||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|C+0#e000002&| +0#0000000&@15||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|C+0#e000002&| +0#0000000&@15||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|C+0#e000002&| +0#0000000&@15||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|P+0#e000002&|O|S|I|X| +0#0000000&@11||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|P+0#e000002&|O|S|I|X| +0#0000000&@11||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|P+0#e000002&|O|S|I|X| +0#0000000&@11||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|P+0#e000002&|O|S|I|X| +0#0000000&@11||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|P+0#e000002&|O|S|I|X| +0#0000000&@11||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +@75 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +@57|7|3|,|1| @9|4|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_language_05.dump b/runtime/syntax/testdir/dumps/vim_ex_language_05.dump new file mode 100644 index 0000000000..938098877a --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_language_05.dump @@ -0,0 +1,20 @@ +|l+0#af5f00255#ffffff0|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@27 +@75 +|d+0#af5f00255&|e|f| +0#0000000&|V|i|m|9|C|o|n|t|e|x|t|(+0#e000e06&|)| +0#0000000&@57 +> @74 +@2|#+0#0000e05&| |p|r|i|n|t| |c|o|m@1|a|n|d|s| +0#0000000&@56 +@75 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@64 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@56 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@58 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@59 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&@55 +@75 +@75 +@2|#+0#0000e05&| |s|e|t| |c|o|m@1|a|n|d|s| +0#0000000&@58 +@75 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|C+0#e000002&| +0#0000000&@53 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|C+0#e000002&| +0#0000000&@53 +@57|9|1|,|0|-|1| @7|5@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_language_06.dump b/runtime/syntax/testdir/dumps/vim_ex_language_06.dump new file mode 100644 index 0000000000..9a55c3b69f --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_language_06.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@1|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|C+0#e000002&| +0#0000000&@53 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|C+0#e000002&| +0#0000000&@53 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|C+0#e000002&| +0#0000000&@53 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|C+0#e000002&| +0#0000000&@53 +@75 +@2>l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|P+0#e000002&|O|S|I|X| +0#0000000&@49 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|P+0#e000002&|O|S|I|X| +0#0000000&@49 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|P+0#e000002&|O|S|I|X| +0#0000000&@49 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|P+0#e000002&|O|S|I|X| +0#0000000&@49 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|P+0#e000002&|O|S|I|X| +0#0000000&@49 +@75 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0@38 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0@38 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0@38 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0@38 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0@38 +@75 +@75 +@2|#+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| |a|n|d| |t|r|a|i|l|i|n|g| |b|a|r| +0#0000000&@41 +@57|1|0|9|,|3| @8|6|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_language_07.dump b/runtime/syntax/testdir/dumps/vim_ex_language_07.dump new file mode 100644 index 0000000000..a807f486a2 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_language_07.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@1|#+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| |a|n|d| |t|r|a|i|l|i|n|g| |b|a|r| +0#0000000&@41 +@75 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45 +@2>l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45 +@75 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|C+0#e000002&| +0#0000000&@15|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|C+0#e000002&| +0#0000000&@15|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|C+0#e000002&| +0#0000000&@15|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|C+0#e000002&| +0#0000000&@15|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|C+0#e000002&| +0#0000000&@15|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@75 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|P+0#e000002&|O|S|I|X| +0#0000000&@11|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|P+0#e000002&|O|S|I|X| +0#0000000&@11|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|P+0#e000002&|O|S|I|X| +0#0000000&@11|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|P+0#e000002&|O|S|I|X| +0#0000000&@11|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|P+0#e000002&|O|S|I|X| +0#0000000&@11|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@57|1|2|7|,|3| @8|7|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_language_08.dump b/runtime/syntax/testdir/dumps/vim_ex_language_08.dump new file mode 100644 index 0000000000..285d4f2855 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_language_08.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@1|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|P+0#e000002&|O|S|I|X| +0#0000000&@11|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@75 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@2>l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@28 +@75 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@42 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@42 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@42 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@42 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@42 +@75 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|C+0#e000002&| +0#0000000&@15||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|C+0#e000002&| +0#0000000&@15||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|C+0#e000002&| +0#0000000&@15||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|C+0#e000002&| +0#0000000&@15||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|C+0#e000002&| +0#0000000&@15||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@57|1|4|5|,|3| @8|9|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_language_09.dump b/runtime/syntax/testdir/dumps/vim_ex_language_09.dump new file mode 100644 index 0000000000..29fcdc64b8 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_language_09.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@1|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|C+0#e000002&| +0#0000000&@15||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@75 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|P+0#e000002&|O|S|I|X| +0#0000000&@11||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|P+0#e000002&|O|S|I|X| +0#0000000&@11||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|P+0#e000002&|O|S|I|X| +0#0000000&@11||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@2>l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|P+0#e000002&|O|S|I|X| +0#0000000&@11||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|P+0#e000002&|O|S|I|X| +0#0000000&@11||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@75 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@9|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|o|l@1|a|t|e| +0#0000000&@1|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|c+0#e000e06&|t|y|p|e| +0#0000000&@3|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|t+0#e000e06&|i|m|e| +0#0000000&@4|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +@2|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&|m+0#e000e06&|e|s@1|a|g|e|s| +0#0000000&|d+0#0000001#ffff4012|e|_|D|E|.|U|T|F|-|8|@|e|u|r|o| +0#0000000#ffffff0||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@25 +|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 +@75 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|6|3|,|3| @8|B|o|t| diff --git a/runtime/syntax/testdir/input/vim_ex_language.vim b/runtime/syntax/testdir/input/vim_ex_language.vim new file mode 100644 index 0000000000..d4742a412f --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_language.vim @@ -0,0 +1,172 @@ +" Vim :language command +" VIM_TEST_SETUP hi link vimLanguageName Todo + + +" print commands + +language +language collate +language ctype +language time +language messages + + +" set commands + +language C +language collate C +language ctype C +language time C +language messages C + +language POSIX +language collate POSIX +language ctype POSIX +language time POSIX +language messages POSIX + +language de_DE.UTF-8@euro +language collate de_DE.UTF-8@euro +language ctype de_DE.UTF-8@euro +language time de_DE.UTF-8@euro +language messages de_DE.UTF-8@euro + +" tail comment and trailing bar + +language " comment +language collate " comment +language ctype " comment +language time " comment +language messages " comment + +language de_DE.UTF-8@euro " comment +language collate de_DE.UTF-8@euro " comment +language ctype de_DE.UTF-8@euro " comment +language time de_DE.UTF-8@euro " comment +language messages de_DE.UTF-8@euro " comment + +language C " comment +language collate C " comment +language ctype C " comment +language time C " comment +language messages C " comment + +language POSIX " comment +language collate POSIX " comment +language ctype POSIX " comment +language time POSIX " comment +language messages POSIX " comment + +language de_DE.UTF-8@euro " comment +language collate de_DE.UTF-8@euro " comment +language ctype de_DE.UTF-8@euro " comment +language time de_DE.UTF-8@euro " comment +language messages de_DE.UTF-8@euro " comment + +language | echo "..." +language collate | echo "..." +language ctype | echo "..." +language time | echo "..." +language messages | echo "..." + +language C | echo "..." +language collate C | echo "..." +language ctype C | echo "..." +language time C | echo "..." +language messages C | echo "..." + +language POSIX | echo "..." +language collate POSIX | echo "..." +language ctype POSIX | echo "..." +language time POSIX | echo "..." +language messages POSIX | echo "..." + +language de_DE.UTF-8@euro | echo "..." +language collate de_DE.UTF-8@euro | echo "..." +language ctype de_DE.UTF-8@euro | echo "..." +language time de_DE.UTF-8@euro | echo "..." +language messages de_DE.UTF-8@euro | echo "..." + +def Vim9Context() + + # print commands + + language + language collate + language ctype + language time + language messages + + + # set commands + + language C + language collate C + language ctype C + language time C + language messages C + + language POSIX + language collate POSIX + language ctype POSIX + language time POSIX + language messages POSIX + + language de_DE.UTF-8@euro + language collate de_DE.UTF-8@euro + language ctype de_DE.UTF-8@euro + language time de_DE.UTF-8@euro + language messages de_DE.UTF-8@euro + + + # tail comment and trailing bar + + language # comment + language collate # comment + language ctype # comment + language time # comment + language messages # comment + + language C # comment + language collate C # comment + language ctype C # comment + language time C # comment + language messages C # comment + + language POSIX # comment + language collate POSIX # comment + language ctype POSIX # comment + language time POSIX # comment + language messages POSIX # comment + + language de_DE.UTF-8@euro # comment + language collate de_DE.UTF-8@euro # comment + language ctype de_DE.UTF-8@euro # comment + language time de_DE.UTF-8@euro # comment + language messages de_DE.UTF-8@euro # comment + + language | echo "..." + language collate | echo "..." + language ctype | echo "..." + language time | echo "..." + language messages | echo "..." + + language C | echo "..." + language collate C | echo "..." + language ctype C | echo "..." + language time C | echo "..." + language messages C | echo "..." + + language POSIX | echo "..." + language collate POSIX | echo "..." + language ctype POSIX | echo "..." + language time POSIX | echo "..." + language messages POSIX | echo "..." + + language de_DE.UTF-8@euro | echo "..." + language collate de_DE.UTF-8@euro | echo "..." + language ctype de_DE.UTF-8@euro | echo "..." + language time de_DE.UTF-8@euro | echo "..." + language messages de_DE.UTF-8@euro | echo "..." +enddef + diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 6d1d003818..9a26434792 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 Nov 27 +" Last Change: 2025 Nov 29 " Former Maintainer: Charles E. Campbell " DO NOT CHANGE DIRECTLY. @@ -35,8 +35,8 @@ syn cluster vimCommentGroup contains=vimTodo,@Spell " regular vim commands {{{2 " GEN_SYN_VIM: vimCommand normal, START_STR='syn keyword vimCommand contained', END_STR='nextgroup=vimBang' syn keyword vimCommand contained al[l] ar[gs] arga[dd] argd[elete] argded[upe] arge[dit] argg[lobal] argl[ocal] argu[ment] as[cii] b[uffer] bN[ext] ba[ll] bad[d] balt bd[elete] bf[irst] bl[ast] bm[odified] bn[ext] bp[revious] br[ewind] brea[k] buffers bun[load] bw[ipeout] cN[ext] cNf[ile] cabo[ve] cad[dbuffer] cadde[xpr] caddf[ile] caf[ter] cb[uffer] cbe[fore] cbel[ow] cbo[ttom] cc ccl[ose] ce[nter] cex[pr] cf[ile] cfir[st] cg[etfile] cgetb[uffer] cgete[xpr] changes che[ckpath] checkt[ime] chi[story] cl[ist] clip[reset] cla[st] clo[se] cle[arjumps] cn[ext] cnew[er] cnf[ile] col[der] colo[rscheme] comc[lear] comp[iler] con[tinue] cope[n] cp[revious] cpf[ile] cq[uit] cr[ewind] cs[cope] cst[ag] cw[indow] delm[arks] defc[ompile] di[splay] dif[fupdate] diffg[et] diffo[ff] nextgroup=vimBang -syn keyword vimCommand contained diffp[atch] diffpu[t] diffs[plit] difft[his] dig[raphs] disa[ssemble] dj[ump] dli[st] dr[op] ds[earch] dsp[lit] e[dit] ea[rlier] em[enu] endfo[r] endt[ry] endw[hile] ene[w] ex exi[t] exu[sage] f[ile] files fin[d] fina[lly] fini[sh] fir[st] fix[del] fo[ld] foldc[lose] foldo[pen] g[lobal] go[to] gu[i] gv[im] h[elp] helpc[lose] helpf[ind] helpt[ags] ha[rdcopy] ij[ump] il[ist] int[ro] ip[ut] is[earch] isp[lit] ju[mps] l[ist] lN[ext] lNf[ile] la[st] lab[ove] lan[guage] lad[dexpr] laddb[uffer] laddf[ile] laf[ter] lat[er] lb[uffer] lbe[fore] lbel[ow] lbo[ttom] lcl[ose] lcs[cope] le[ft] lex[pr] lf[ile] lfir[st] lg[etfile] lgetb[uffer] lgete[xpr] lhi[story] ll lla[st] lli[st] lmak[e] lne[xt] lnew[er] lnf[ile] lo[adview] lockv[ar] lol[der] nextgroup=vimBang -syn keyword vimCommand contained lop[en] lp[revious] lpf[ile] lr[ewind] lt[ag] lw[indow] ls m[ove] marks mes[sages] mk[exrc] mks[ession] mksp[ell] mkv[imrc] mkvie[w] mod[e] n[ext] nb[key] nbc[lose] nbs[tart] noh[lsearch] nu[mber] o[pen] ol[dfiles] on[ly] opt[ions] ow[nsyntax] p[rint] pa[ckadd] packl[oadall] pb[uffer] pc[lose] ped[it] po[p] pp[op] pre[serve] prev[ious] ps[earch] pt[ag] ptN[ext] ptf[irst] ptj[ump] ptl[ast] ptn[ext] ptp[revious] ptr[ewind] pts[elect] pu[t] pw[d] q[uit] quita[ll] qa[ll] r[ead] rec[over] red[o] redr[aw] redraws[tatus] redrawt[abline] redrawtabp[anel] reg[isters] res[ize] ret[ab] rew[ind] ri[ght] ru[ntime] rund[o] rv[iminfo] sN[ext] sa[rgument] sal[l] sav[eas] sb[uffer] sbN[ext] sba[ll] sbf[irst] sbl[ast] sbm[odified] sbn[ext] sbp[revious] nextgroup=vimBang +syn keyword vimCommand contained diffp[atch] diffpu[t] diffs[plit] difft[his] dig[raphs] disa[ssemble] dj[ump] dli[st] dr[op] ds[earch] dsp[lit] e[dit] ea[rlier] em[enu] endfo[r] endt[ry] endw[hile] ene[w] ex exi[t] exu[sage] f[ile] files fin[d] fina[lly] fini[sh] fir[st] fix[del] fo[ld] foldc[lose] foldo[pen] g[lobal] go[to] gu[i] gv[im] h[elp] helpc[lose] helpf[ind] helpt[ags] ha[rdcopy] ij[ump] il[ist] int[ro] ip[ut] is[earch] isp[lit] ju[mps] l[ist] lN[ext] lNf[ile] la[st] lab[ove] lad[dexpr] laddb[uffer] laddf[ile] laf[ter] lat[er] lb[uffer] lbe[fore] lbel[ow] lbo[ttom] lcl[ose] lcs[cope] le[ft] lex[pr] lf[ile] lfir[st] lg[etfile] lgetb[uffer] lgete[xpr] lhi[story] ll lla[st] lli[st] lmak[e] lne[xt] lnew[er] lnf[ile] lo[adview] lockv[ar] lol[der] lop[en] nextgroup=vimBang +syn keyword vimCommand contained lp[revious] lpf[ile] lr[ewind] lt[ag] lw[indow] ls m[ove] marks mes[sages] mk[exrc] mks[ession] mksp[ell] mkv[imrc] mkvie[w] mod[e] n[ext] nb[key] nbc[lose] nbs[tart] noh[lsearch] nu[mber] o[pen] ol[dfiles] on[ly] opt[ions] ow[nsyntax] p[rint] pa[ckadd] packl[oadall] pb[uffer] pc[lose] ped[it] po[p] pp[op] pre[serve] prev[ious] ps[earch] pt[ag] ptN[ext] ptf[irst] ptj[ump] ptl[ast] ptn[ext] ptp[revious] ptr[ewind] pts[elect] pu[t] pw[d] q[uit] quita[ll] qa[ll] r[ead] rec[over] red[o] redr[aw] redraws[tatus] redrawt[abline] redrawtabp[anel] reg[isters] res[ize] ret[ab] rew[ind] ri[ght] ru[ntime] rund[o] rv[iminfo] sN[ext] sa[rgument] sal[l] sav[eas] sb[uffer] sbN[ext] sba[ll] sbf[irst] sbl[ast] sbm[odified] sbn[ext] sbp[revious] nextgroup=vimBang syn keyword vimCommand contained sbr[ewind] scr[iptnames] scripte[ncoding] scriptv[ersion] scs[cope] setf[iletype] sf[ind] sfir[st] sh[ell] sim[alt] sig[n] sla[st] sn[ext] so[urce] spe[llgood] spelld[ump] spelli[nfo] spellr[epall] spellra[re] spellu[ndo] spellw[rong] spr[evious] sre[wind] st[op] sta[g] star[tinsert] startg[replace] startr[eplace] stopi[nsert] stj[ump] sts[elect] sun[hide] sus[pend] sv[iew] sync[bind] smi[le] t tN[ext] ta[g] tags tabc[lose] tabe[dit] tabf[ind] tabfir[st] tabm[ove] tabl[ast] tabn[ext] tabnew tabo[nly] tabp[revious] tabN[ext] tabr[ewind] tabs te[aroff] tf[irst] tj[ump] tl[ast] tn[ext] tp[revious] tr[ewind] try ts[elect] u[ndo] undoj[oin] undol[ist] unh[ide] up[date] v[global] ve[rsion] vi[sual] vie[w] viu[sage] vne[w] vs[plit] w[rite] nextgroup=vimBang syn keyword vimCommand contained wN[ext] wa[ll] wi[nsize] winp[os] wl[restore] wn[ext] wp[revious] wq wqa[ll] wu[ndo] wv[iminfo] x[it] xa[ll] xr[estore] y[ank] z dl dell delel deletl deletel dp dep delp delep deletp deletep a i nextgroup=vimBang @@ -300,7 +300,7 @@ syn match vimNumber '\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*' skipwhite nextgroup=@vi syn case match " All vimCommands are contained by vimIsCommand. {{{2 -syn cluster vimCmdList contains=vimAbb,vimAddress,vimAt,vimAutocmd,vimAugroup,vimBehave,vimBreakadd,vimBreakdel,vimBreaklist,vimCall,vimCatch,vimCd,vimCommandModifier,vimConst,vimDoautocmd,vimDebug,vimDebuggreedy,vimDef,vimDefFold,vimDefer,vimDelcommand,vimDelFunction,vimDoCommand,@vimEcho,vimElse,vimEnddef,vimEndfunction,vimEndif,vimEval,vimExecute,vimIsCommand,vimExtCmd,vimExFilter,vimExMark,vimFiletype,vimFor,vimFunction,vimFunctionFold,vimGrep,vimGrepAdd,vimGlobal,vimHelpgrep,vimHighlight,vimHistory,vimImport,vimLet,vimLoadkeymap,vimLockvar,vimMake,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimProfdel,vimProfile,vimPrompt,vimRedir,vimSet,vimSleep,vimSort,vimSyntax,vimSyntime,vimSynColor,vimSynLink,vimTerminal,vimThrow,vimUniq,vimUnlet,vimUnlockvar,vimUnmap,vimUserCmd,vimVimgrep,vimVimgrepadd,vimWincmd,vimMenu,vimMenutranslate,@vim9CmdList,@vimExUserCmdList,vimLua,vimMzScheme,vimPerl,vimPython,vimPython3,vimPythonX,vimRuby,vimTcl +syn cluster vimCmdList contains=vimAbb,vimAddress,vimAt,vimAutocmd,vimAugroup,vimBehave,vimBreakadd,vimBreakdel,vimBreaklist,vimCall,vimCatch,vimCd,vimCommandModifier,vimConst,vimDoautocmd,vimDebug,vimDebuggreedy,vimDef,vimDefFold,vimDefer,vimDelcommand,vimDelFunction,vimDoCommand,@vimEcho,vimElse,vimEnddef,vimEndfunction,vimEndif,vimEval,vimExecute,vimIsCommand,vimExtCmd,vimExFilter,vimExMark,vimFiletype,vimFor,vimFunction,vimFunctionFold,vimGrep,vimGrepAdd,vimGlobal,vimHelpgrep,vimHighlight,vimHistory,vimImport,vimLanguage,vimLet,vimLoadkeymap,vimLockvar,vimMake,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimProfdel,vimProfile,vimPrompt,vimRedir,vimSet,vimSleep,vimSort,vimSyntax,vimSyntime,vimSynColor,vimSynLink,vimTerminal,vimThrow,vimUniq,vimUnlet,vimUnlockvar,vimUnmap,vimUserCmd,vimVimgrep,vimVimgrepadd,vimWincmd,vimMenu,vimMenutranslate,@vim9CmdList,@vimExUserCmdList,vimLua,vimMzScheme,vimPerl,vimPython,vimPython3,vimPythonX,vimRuby,vimTcl syn cluster vim9CmdList contains=vim9Abstract,vim9Class,vim9Const,vim9Enum,vim9Export,vim9Final,vim9For,vim9Interface,vim9Type,vim9Var syn match vimCmdSep "\\\@1" skipwhite nextgroup=@vimComment syn match vimImport "\" skipwhite nextgroup=vimImportAutoload,vimImportFilename +" Language {{{2 +" ======== +syn keyword vimLanguage lan[guage] skipwhite nextgroup=@vimLanguageName,vimLanguageCategory,vimSep,vimComment,vim9Comment +syn keyword vimLanguageCategory contained col[late] cty[pe] mes[sages] tim[e] skipwhite nextgroup=@vimLanguageName + +" [language[_territory][.codeset][@modifier]] and the reserved "C" and "POSIX" +syn match vimLanguageName contained "[[:alnum:]][[:alnum:]._@-]*[[:alnum:]]" nextgroup=vimSep,vimComment,vim9Comment +syn keyword vimLanguageNameReserved contained C POSIX nextgroup=vimSep,vimComment,vim9Comment +syn cluster vimLanguageName contains=vimLanguageName,vimLanguageNameReserved + " Augroup : vimAugroupError removed because long augroups caused sync'ing problems. {{{2 " ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking. syn cluster vimAugroupList contains=@vimCmdList,vimFilter,@vimFunc,vimLineComment,vimSpecFile,vimOper,vimNumber,vimOperParen,@vimComment,vimString,vimSubst,vimRegister,vimCmplxRepeat,vimNotation,vimCtrlChar,vimContinue @@ -2597,6 +2607,9 @@ if !exists("skip_vim_syntax_inits") hi def link vimKeymapTailComment vimComment hi def link vimLambdaBrace Delimiter hi def link vimLambdaOperator vimOper + hi def link vimLanguage vimCommand + hi def link vimLanguageCategory Special + hi def link vimLanguageNameReserved Constant hi def link vimLet vimCommand hi def link vimLetHeredoc vimString hi def link vimLetHeredocStart Special