From: Doug Kearns Date: Sun, 18 May 2025 18:37:34 +0000 (+0200) Subject: runtime(vim): Update base-syntax, improve :import highlighting X-Git-Tag: v9.1.1399~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b5550fac7d37f35285c78a8e74674817a7cfc99;p=thirdparty%2Fvim.git runtime(vim): Update base-syntax, improve :import highlighting - Match "autoload" as a keyword in :import commands. - Match an expression argument for the filename. closes: #15375 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 f37f0467bc..e3317fca7c 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 May 16 +" Last Change: 2025 May 17 let s:keepcpo= &cpo set cpo&vim @@ -293,6 +293,7 @@ function s:get_vim_command_type(cmd_name) grepadd helpgrep if + import interface insert let diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base index 4ab45b923e..99d0480dc9 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 May 16 +" Last Change: 2025 May 17 " Former Maintainer: Charles E. Campbell " DO NOT CHANGE DIRECTLY. @@ -233,7 +233,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,vimAutocmd,vimAugroup,vimBehave,vimCall,vimCatch,vimConst,vimDoautocmd,vimDebuggreedy,vimDef,vimDefFold,vimDelcommand,@vimEcho,vimElse,vimEnddef,vimEndfunction,vimEndif,vimExecute,vimIsCommand,vimExtCmd,vimExFilter,vimFor,vimFunction,vimFuncFold,vimGrep,vimGrepAdd,vimGlobal,vimHelpgrep,vimHighlight,vimLet,vimLoadkeymap,vimLockvar,vimMake,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimRedir,vimSet,vimSleep,vimSort,vimSyntax,vimThrow,vimUnlet,vimUnlockvar,vimUnmap,vimUserCmd,vimVimgrep,vimVimgrepadd,vimMenu,vimMenutranslate,@vim9CmdList,@vimExUserCmdList,vimLua,vimMzScheme,vimPerl,vimPython,vimPython3,vimPythonX,vimRuby,vimTcl +syn cluster vimCmdList contains=vimAbb,vimAddress,vimAutocmd,vimAugroup,vimBehave,vimCall,vimCatch,vimConst,vimDoautocmd,vimDebuggreedy,vimDef,vimDefFold,vimDelcommand,@vimEcho,vimElse,vimEnddef,vimEndfunction,vimEndif,vimExecute,vimIsCommand,vimExtCmd,vimExFilter,vimFor,vimFunction,vimFuncFold,vimGrep,vimGrepAdd,vimGlobal,vimHelpgrep,vimHighlight,vimImport,vimLet,vimLoadkeymap,vimLockvar,vimMake,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimRedir,vimSet,vimSleep,vimSort,vimSyntax,vimThrow,vimUnlet,vimUnlockvar,vimUnmap,vimUserCmd,vimVimgrep,vimVimgrepadd,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 + " 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 @@ -1880,7 +1921,7 @@ if exists("g:vimsyn_minlines") endif exe "syn sync maxlines=".s:vimsyn_maxlines syn sync linecont "^\s\+\\" -syn sync linebreaks=1 +syn sync linebreaks=2 syn sync match vimAugroupSyncA groupthere NONE "\\s\+[eE][nN][dD]" " ==================== @@ -2013,6 +2054,9 @@ if !exists("skip_vim_syntax_inits") hi def link vimHiStartStop vimHiTerm hi def link vimHiTerm Type hi def link vimHLGroup vimGroup + hi def link vimImport vimCommand + hi def link vimImportAutoload Special + hi def link vimImportAs vimImport hi def link vimInsert vimString hi def link vim9KeymapLineComment vimKeymapLineComment hi def link vimKeymapLineComment vimComment diff --git a/runtime/syntax/testdir/dumps/vim9_ex_import_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_import_00.dump new file mode 100644 index 0000000000..b54d713038 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_ex_import_00.dump @@ -0,0 +1,20 @@ +>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 +|#+0#0000e05&| |V|i|m|9| |:|i|m|p|o|r|t| |c|o|m@1|a|n|d| +0#0000000&@52 +|#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|I|m|p|o|r|t|N|a|m|e| |T|o|d|o| +0#0000000&@31 +@75 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@58 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@39 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@61 +@2|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@61 +@2|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@63 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@63 +@2|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@61 +@2|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@61 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| | +0#0000000&@62 +@2|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@61 +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_import_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_import_01.dump new file mode 100644 index 0000000000..51f8ba9e57 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_ex_import_01.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@1|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@61 +@2|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@61 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| | +0#0000000&@62 +@2>"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@61 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@2|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@63 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| | +0#0000000&@62 +@2|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@61 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@2|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@61 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|r| +0#0000000#ffffff0@51 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@32 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@61 +@57|1|9|,|3| @9|1|2|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_import_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_import_02.dump new file mode 100644 index 0000000000..0fc54ef3ca --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_ex_import_02.dump @@ -0,0 +1,20 @@ +|i+0#af5f00255#ffffff0|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@61 +@2|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@61 +@2|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@63 +@2|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@66 +@75 +>i+0#af5f00255&|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@63 +@2|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@61 +@2|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@61 +@2|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@66 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| | +0#0000000&@62 +@2|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@61 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@2|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@63 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@2|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@66 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53 +@57|3|7|,|1| @9|3|0|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_import_03.dump b/runtime/syntax/testdir/dumps/vim9_ex_import_03.dump new file mode 100644 index 0000000000..efbc9203d9 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_ex_import_03.dump @@ -0,0 +1,20 @@ +|i+0#af5f00255#ffffff0|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| | +0#0000000&@62 +@2|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@61 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@2|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@61 +@2>#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@2|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@66 +@75 +|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |i+0#af5f00255&|m|p|o|r|t| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@45 +@75 +@75 +|#+0#0000e05&| |a|u|t|o|l|o|a|d| +0#0000000&@64 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@49 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@30 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@52 +@2|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@61 +@2|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@63 +@57|5@1|,|3| @9|4|8|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_import_04.dump b/runtime/syntax/testdir/dumps/vim9_ex_import_04.dump new file mode 100644 index 0000000000..d1e55258a6 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_ex_import_04.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@1|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@63 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@54 +@2|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@61 +@2|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@61 +> @74 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@42 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| | +0#0000000&@62 +@2|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@61 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@2|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@63 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@44 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| | +0#0000000&@62 +@2|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@61 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@2|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@61 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|r| +0#0000000#ffffff0@42 +@57|7|3|,|0|-|1| @7|6@1|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_import_05.dump b/runtime/syntax/testdir/dumps/vim9_ex_import_05.dump new file mode 100644 index 0000000000..7d5e19fdae --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_ex_import_05.dump @@ -0,0 +1,20 @@ +|i+0#af5f00255#ffffff0|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|r| +0#0000000#ffffff0@42 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@23 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@52 +@2|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@61 +@2>"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@63 +@2|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@66 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@54 +@2|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@61 +@2|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@61 +@2|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@66 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@42 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| | +0#0000000&@62 +@2|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@61 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@2|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@63 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@57|9|1|,|3| @9|8|4|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_import_06.dump b/runtime/syntax/testdir/dumps/vim9_ex_import_06.dump new file mode 100644 index 0000000000..28c5926225 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_ex_import_06.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@1|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@2|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@66 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@44 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| | +0#0000000&@62 +@2>?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@61 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@2|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@61 +@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 +@2|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@66 +@75 +@75 +|#+0#0000e05&| |"+0#e000002&|a|s|"| +0#0000e05&|k|e|y|w|o|r|d| |i|n| |e|x|p|r| +0#0000000&@52 +@75 +|v+0#af5f00255&|a|r| +0#0000000&|a+0#00e0e07&|s| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|m|o|d|u|l|e|s|/|"| +0#0000000&@55 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|a+0#00e0e07&|s| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|a+0#00e0e07&|s| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|o+0#0000001#ffff4012|t|h|e|r| +0#0000000#ffffff0@18 +@75 +|~+0#4040ff13&| @73 +|~| @73 +| +0#0000000&@56|1|0|9|,|3| @8|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_import_00.dump b/runtime/syntax/testdir/dumps/vim_ex_import_00.dump new file mode 100644 index 0000000000..8d1e40f005 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_import_00.dump @@ -0,0 +1,20 @@ +>"+0#0000e05#ffffff0| |V|i|m| |:|i|m|p|o|r|t| |c|o|m@1|a|n|d| +0#0000000&@53 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|I|m|p|o|r|t|N|a|m|e| |T|o|d|o| +0#0000000&@31 +@75 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@58 +|i+0#af5f00255&|m|p|o|r| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@38 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@59 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@55 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@57 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&@61 +@6|\+0#e000e06&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@55 +@6|\+0#e000e06&| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@55 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@59 +@6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@55 +@6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_import_01.dump b/runtime/syntax/testdir/dumps/vim_ex_import_01.dump new file mode 100644 index 0000000000..62070f9740 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_import_01.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@55 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@59 +@6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@55 +@6>"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@57 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&@61 +@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| | +0#0000000&@57 +@6|\+0#e000e06&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@55 +@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@55 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|r| +0#0000000#ffffff0@51 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@30 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@59 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@55 +@57|1|9|,|7| @9|1|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_import_02.dump b/runtime/syntax/testdir/dumps/vim_ex_import_02.dump new file mode 100644 index 0000000000..9fb21c2f41 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_import_02.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@55 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@57 +@6|\+0#e000e06&| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@60 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&@61 +@6>\+0#e000e06&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@55 +@6|\+0#e000e06&| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@55 +@6|\+0#e000e06&| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@60 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@59 +@6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@55 +@6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@57 +@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@60 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&@61 +@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| | +0#0000000&@57 +@57|3|7|,|7| @9|3|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_import_03.dump b/runtime/syntax/testdir/dumps/vim_ex_import_03.dump new file mode 100644 index 0000000000..686b8bdf11 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_import_03.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| | +0#0000000&@57 +@6|\+0#e000e06&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@55 +@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@55 +@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 +@6>\+0#e000e06&| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@60 +@75 +|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |i+0#af5f00255&|m|p|o|r|t| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@45 +@75 +@75 +|"+0#0000e05&| |a|u|t|o|l|o|a|d| +0#0000000&@64 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@49 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@28 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@50 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@55 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@57 +@75 +@57|5@1|,|7| @9|4|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_import_04.dump b/runtime/syntax/testdir/dumps/vim_ex_import_04.dump new file mode 100644 index 0000000000..957e4d9988 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_import_04.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@74 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&@52 +@6|\+0#e000e06&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@55 +@6|\+0#e000e06&| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@55 +@75 +>i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@50 +@6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 +| +0#e000002&@5|\+0#e000e06&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@56 +@6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@57 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&@52 +@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| | +0#0000000&@57 +@6|\+0#e000e06&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@55 +@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@55 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|r| +0#0000000#ffffff0@42 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@21 +@57|7|3|,|1| @9|6|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_import_05.dump b/runtime/syntax/testdir/dumps/vim_ex_import_05.dump new file mode 100644 index 0000000000..151b5eb3e1 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_import_05.dump @@ -0,0 +1,20 @@ +|i+0#af5f00255#ffffff0|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@21 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@50 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@55 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@57 +@6>\+0#e000e06&| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@60 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&@52 +@6|\+0#e000e06&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@55 +@6|\+0#e000e06&| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@55 +@6|\+0#e000e06&| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@60 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&@50 +@6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@55 +@6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@57 +@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@60 +@57|9|1|,|7| @9|8|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_import_06.dump b/runtime/syntax/testdir/dumps/vim_ex_import_06.dump new file mode 100644 index 0000000000..7716921dd0 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_import_06.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@60 +@75 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|a+0#e000e06&|u|t|o|l|o|a|d| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&@52 +@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| | +0#0000000&@57 +@6|\+0#e000e06&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&@55 +@6>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&@55 +@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|b+0#0000001#ffff4012|a|z| +0#0000000#ffffff0@60 +@75 +@75 +|"+0#0000e05&| |"+0#e000002&|a|s|"| +0#0000e05&|k|e|y|w|o|r|d| |i|n| |e|x|p|r| +0#0000000&@52 +@75 +|l+0#af5f00255&|e|t| +0#0000000&|a+0#00e0e07&|s| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|m|o|d|u|l|e|s|/|"| +0#0000000&@55 +|i+0#af5f00255&|m|p|o|r|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|?+0#af5f00255&| +0#0000000&|a+0#00e0e07&|s| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|"+0#e000002&|f|o@1|.|v|i|m|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|a+0#00e0e07&|s| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|"+0#e000002&|b|a|r|.|v|i|m|"| +0#0000000&|a+0#af5f00255&|s| +0#0000000&|o+0#0000001#ffff4012|t|h|e|r| +0#0000000#ffffff0@16 +@75 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|0|9|,|7| @8|B|o|t| diff --git a/runtime/syntax/testdir/input/setup/vim9_ex_import.vim b/runtime/syntax/testdir/input/setup/vim9_ex_import.vim new file mode 100644 index 0000000000..ebd90ede92 --- /dev/null +++ b/runtime/syntax/testdir/input/setup/vim9_ex_import.vim @@ -0,0 +1 @@ +hi link vimVar Identifier diff --git a/runtime/syntax/testdir/input/setup/vim_ex_import.vim b/runtime/syntax/testdir/input/setup/vim_ex_import.vim new file mode 100644 index 0000000000..ebd90ede92 --- /dev/null +++ b/runtime/syntax/testdir/input/setup/vim_ex_import.vim @@ -0,0 +1 @@ +hi link vimVar Identifier diff --git a/runtime/syntax/testdir/input/vim9_ex_import.vim b/runtime/syntax/testdir/input/vim9_ex_import.vim new file mode 100644 index 0000000000..bedd5bbda7 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_ex_import.vim @@ -0,0 +1,120 @@ +vim9script +# Vim9 :import command +# VIM_TEST_SETUP hi link vimImportName Todo + + +import "foo.vim" +import true ? "foo.vim" : "bar.vim" + +import true ? + "foo.vim" : + "bar.vim" + +import true + ? "foo.vim" + : "bar.vim" + +import true ? # comment + # comment + "foo.vim" : + # comment + "bar.vim" + +import true # comment + # comment + ? "foo.vim" + # comment + : "bar.vim" + +import "foo.vim" as bar +import true ? "foo.vim" : "bar.vim" as baz + +import true ? + "foo.vim" : + "bar.vim" + as baz + +import true + ? "foo.vim" + : "bar.vim" + as baz + +import true ? # comment + # comment + "foo.vim" : + # comment + "bar.vim" + # comment + as baz + +import true # comment + # comment + ? "foo.vim" + # comment + : "bar.vim" + # comment + as baz + +echo "Foo" | import "foo.vim" + + +# autoload + +import autoload "foo.vim" +import autoload true ? "foo.vim" : "bar.vim" + +import autoload true ? + "foo.vim" : + "bar.vim" + +import autoload true + ? "foo.vim" + : "bar.vim" + +import autoload true ? # comment + # comment + "foo.vim" : + # comment + "bar.vim" + +import autoload true # comment + # comment + ? "foo.vim" + # comment + : "bar.vim" + +import autoload "foo.vim" as bar +import autoload true ? "foo.vim" : "bar.vim" as baz + +import autoload true ? + "foo.vim" : + "bar.vim" + as baz + +import autoload true + ? "foo.vim" + : "bar.vim" + as baz + +import autoload true ? # comment + # comment + "foo.vim" : + # comment + "bar.vim" + # comment + as baz + +import autoload true # comment + # comment + ? "foo.vim" + # comment + : "bar.vim" + # comment + as baz + + +# "as" keyword in expr + +var as = "modules/" +import true ? as .. "foo.vim" : as .. "bar.vim" as other + diff --git a/runtime/syntax/testdir/input/vim_ex_import.vim b/runtime/syntax/testdir/input/vim_ex_import.vim new file mode 100644 index 0000000000..07df827b9e --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_import.vim @@ -0,0 +1,119 @@ +" Vim :import command +" VIM_TEST_SETUP hi link vimImportName Todo + + +import "foo.vim" +impor v:true ? "foo.vim" : "bar.vim" + +import v:true ? + \ "foo.vim" : + \ "bar.vim" + +import v:true + \ ? "foo.vim" + \ : "bar.vim" + +import v:true ? + "\ comment + \ "foo.vim" : + "\ comment + \ "bar.vim" + +import v:true + "\ comment + \ ? "foo.vim" + "\ comment + \ : "bar.vim" + +import "foo.vim" as bar +import v:true ? "foo.vim" : "bar.vim" as baz + +import v:true ? + \ "foo.vim" : + \ "bar.vim" + \ as baz + +import v:true + \ ? "foo.vim" + \ : "bar.vim" + \ as baz + +import v:true ? + "\ comment + \ "foo.vim" : + "\ comment + \ "bar.vim" + "\ comment + \ as baz + +import v:true + "\ comment + \ ? "foo.vim" + "\ comment + \ : "bar.vim" + "\ comment + \ as baz + +echo "Foo" | import "foo.vim" + + +" autoload + +import autoload "foo.vim" +import autoload v:true ? "foo.vim" : "bar.vim" + +import autoload v:true ? + \ "foo.vim" : + \ "bar.vim" + +import autoload v:true + \ ? "foo.vim" + \ : "bar.vim" + +import autoload v:true ? + "\ comment + \"foo.vim" : + "\ comment + \ "bar.vim" + +import autoload v:true + "\ comment + \ ? "foo.vim" + "\ comment + \ : "bar.vim" + +import autoload "foo.vim" as bar +import autoload v:true ? "foo.vim" : "bar.vim" as baz + +import autoload v:true ? + \ "foo.vim" : + \ "bar.vim" + \ as baz + +import autoload v:true + \ ? "foo.vim" + \ : "bar.vim" + \ as baz + +import autoload v:true ? + "\ comment + \ "foo.vim" : + "\ comment + \ "bar.vim" + "\ comment + \ as baz + +import autoload v:true + "\ comment + \ ? "foo.vim" + "\ comment + \ : "bar.vim" + "\ comment + \ as baz + + +" "as" keyword in expr + +let as = "modules/" +import v:true ? as .. "foo.vim" : as .. "bar.vim" as other + diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index debed2bea8..d0f3202623 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 May 16 +" Last Change: 2025 May 17 " Former Maintainer: Charles E. Campbell " DO NOT CHANGE DIRECTLY. @@ -34,7 +34,7 @@ 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 abo[veleft] al[l] ar[gs] arga[dd] argd[elete] argdo argded[upe] arge[dit] argg[lobal] argl[ocal] argu[ment] as[cii] b[uffer] bN[ext] ba[ll] bad[d] balt bd[elete] bel[owright] bf[irst] bl[ast] bm[odified] bn[ext] bo[tright] bp[revious] br[ewind] brea[k] breaka[dd] breakd[el] breakl[ist] bro[wse] buffers bufd[o] bun[load] bw[ipeout] c[hange] 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] cd cdo ce[nter] cex[pr] cf[ile] cfd[o] cfir[st] cg[etfile] cgetb[uffer] cgete[xpr] chd[ir] changes che[ckpath] checkt[ime] chi[story] cl[ist] cla[st] clo[se] cle[arjumps] cn[ext] cnew[er] cnf[ile] co[py] col[der] colo[rscheme] com[mand] comc[lear] comp[iler] con[tinue] conf[irm] nextgroup=vimBang -syn keyword vimCommand contained cons[t] cope[n] cp[revious] cpf[ile] cq[uit] cr[ewind] cs[cope] cst[ag] cw[indow] d[elete] delm[arks] deb[ug] defc[ompile] defe[r] delf[unction] di[splay] dif[fupdate] diffg[et] diffo[ff] 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] ev[al] ex exi[t] exu[sage] f[ile] files filet[ype] fin[d] fina[lly] fini[sh] fir[st] fix[del] fo[ld] foldc[lose] foldd[oopen] folddoc[losed] foldo[pen] g[lobal] go[to] gu[i] gv[im] h[elp] helpc[lose] helpf[ind] helpt[ags] ha[rdcopy] hi[ghlight] hid[e] his[tory] hor[izontal] ij[ump] il[ist] imp[ort] int[ro] ip[ut] is[earch] isp[lit] j[oin] ju[mps] k kee[pmarks] keepj[umps] keepp[atterns] nextgroup=vimBang +syn keyword vimCommand contained cons[t] cope[n] cp[revious] cpf[ile] cq[uit] cr[ewind] cs[cope] cst[ag] cw[indow] d[elete] delm[arks] deb[ug] defc[ompile] defe[r] delf[unction] di[splay] dif[fupdate] diffg[et] diffo[ff] 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] ev[al] ex exi[t] exu[sage] f[ile] files filet[ype] fin[d] fina[lly] fini[sh] fir[st] fix[del] fo[ld] foldc[lose] foldd[oopen] folddoc[losed] foldo[pen] g[lobal] go[to] gu[i] gv[im] h[elp] helpc[lose] helpf[ind] helpt[ags] ha[rdcopy] hi[ghlight] hid[e] his[tory] hor[izontal] ij[ump] il[ist] int[ro] ip[ut] is[earch] isp[lit] j[oin] ju[mps] k kee[pmarks] keepj[umps] keepp[atterns] nextgroup=vimBang syn keyword vimCommand contained keepa[lt] 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] lc[d] lch[dir] lcl[ose] lcs[cope] ld[o] le[ft] lefta[bove] lex[pr] leg[acy] lf[ile] lfd[o] lfir[st] lg[etfile] lgetb[uffer] lgete[xpr] lgr[ep] lgrepa[dd] lhi[story] ll lla[st] lli[st] lmak[e] lne[xt] lnew[er] lnf[ile] lo[adview] loc[kmarks] lockv[ar] lol[der] lop[en] lp[revious] lpf[ile] lr[ewind] lt[ag] lw[indow] ls m[ove] ma[rk] marks menut[ranslate] mes[sages] mk[exrc] mks[ession] mksp[ell] mkv[imrc] mkvie[w] mod[e] n[ext] nb[key] nbc[lose] nbs[tart] noa[utocmd] noh[lsearch] nos[wapfile] nu[mber] o[pen] ol[dfiles] on[ly] opt[ions] ow[nsyntax] p[rint] pa[ckadd] packl[oadall] pb[uffer] nextgroup=vimBang syn keyword vimCommand contained pc[lose] ped[it] po[p] pp[op] pre[serve] prev[ious] pro[mptfind] promptr[epl] prof[ile] profd[el] 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] rightb[elow] ru[ntime] rub[y] rubyd[o] rubyf[ile] rund[o] rv[iminfo] sN[ext] sa[rgument] sal[l] san[dbox] sav[eas] sb[uffer] sbN[ext] sba[ll] sbf[irst] sbl[ast] sbm[odified] sbn[ext] sbp[revious] sbr[ewind] scr[iptnames] scripte[ncoding] scriptv[ersion] scs[cope] setf[iletype] sf[ind] sfir[st] sh[ell] sim[alt] sig[n] sil[ent] sla[st] sn[ext] so[urce] sp[lit] spe[llgood] spelld[ump] nextgroup=vimBang syn keyword vimCommand contained 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] sw[apname] synti[me] sync[bind] smi[le] t tN[ext] ta[g] tags tab tabc[lose] tabd[o] tabe[dit] tabf[ind] tabfir[st] tabm[ove] tabl[ast] tabn[ext] tabnew tabo[nly] tabp[revious] tabN[ext] tabr[ewind] tabs tc[d] tch[dir] te[aroff] ter[minal] tf[irst] tj[ump] tl[ast] tn[ext] to[pleft] tp[revious] tr[ewind] try ts[elect] u[ndo] undoj[oin] undol[ist] unh[ide] unlo[ckvar] uns[ilent] up[date] v[global] ve[rsion] verb[ose] vert[ical] vi[sual] vie[w] vim9[cmd] viu[sage] vne[w] vs[plit] w[rite] wN[ext] wa[ll] wi[nsize] winc[md] wind[o] winp[os] nextgroup=vimBang @@ -286,7 +286,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,vimAutocmd,vimAugroup,vimBehave,vimCall,vimCatch,vimConst,vimDoautocmd,vimDebuggreedy,vimDef,vimDefFold,vimDelcommand,@vimEcho,vimElse,vimEnddef,vimEndfunction,vimEndif,vimExecute,vimIsCommand,vimExtCmd,vimExFilter,vimFor,vimFunction,vimFuncFold,vimGrep,vimGrepAdd,vimGlobal,vimHelpgrep,vimHighlight,vimLet,vimLoadkeymap,vimLockvar,vimMake,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimRedir,vimSet,vimSleep,vimSort,vimSyntax,vimThrow,vimUnlet,vimUnlockvar,vimUnmap,vimUserCmd,vimVimgrep,vimVimgrepadd,vimMenu,vimMenutranslate,@vim9CmdList,@vimExUserCmdList,vimLua,vimMzScheme,vimPerl,vimPython,vimPython3,vimPythonX,vimRuby,vimTcl +syn cluster vimCmdList contains=vimAbb,vimAddress,vimAutocmd,vimAugroup,vimBehave,vimCall,vimCatch,vimConst,vimDoautocmd,vimDebuggreedy,vimDef,vimDefFold,vimDelcommand,@vimEcho,vimElse,vimEnddef,vimEndfunction,vimEndif,vimExecute,vimIsCommand,vimExtCmd,vimExFilter,vimFor,vimFunction,vimFuncFold,vimGrep,vimGrepAdd,vimGlobal,vimHelpgrep,vimHighlight,vimImport,vimLet,vimLoadkeymap,vimLockvar,vimMake,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimRedir,vimSet,vimSleep,vimSort,vimSyntax,vimThrow,vimUnlet,vimUnlockvar,vimUnmap,vimUserCmd,vimVimgrep,vimVimgrepadd,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 + " 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 @@ -1941,7 +1982,7 @@ if exists("g:vimsyn_minlines") endif exe "syn sync maxlines=".s:vimsyn_maxlines syn sync linecont "^\s\+\\" -syn sync linebreaks=1 +syn sync linebreaks=2 syn sync match vimAugroupSyncA groupthere NONE "\\s\+[eE][nN][dD]" " ==================== @@ -2074,6 +2115,9 @@ if !exists("skip_vim_syntax_inits") hi def link vimHiStartStop vimHiTerm hi def link vimHiTerm Type hi def link vimHLGroup vimGroup + hi def link vimImport vimCommand + hi def link vimImportAutoload Special + hi def link vimImportAs vimImport hi def link vimInsert vimString hi def link vim9KeymapLineComment vimKeymapLineComment hi def link vimKeymapLineComment vimComment