runtime(vim): fix failing vim syntax test
Commit:
https://github.com/vim/vim/commit/6139766e825ca34948223cb4c88d3900b1940a17
Author: h-east <h.east....@gmail.com>
Date: Fri Jan 3 17:32:54 2025 +0100
runtime(vim): fix failing vim syntax test
after v9.1.0985
related: #16356
Signed-off-by: h-east <h.east....@gmail.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 302eeb4e9..d07c5e2f0 100644
--- a/runtime/syntax/generator/vim.vim.base
+++ b/runtime/syntax/generator/vim.vim.base
@@ -203,7 +203,7 @@ syn case match
" All vimCommands are contained by vimIsCommand. {{{2
syn cluster vimCmdList
contains=vimAbb,vimAddress,vimAutoCmd,vimAugroup,vimBehave,vimCall,vimCatch,vimConst,vimDef,vimDefFold,vimDelcommand,@vimEcho,vimEnddef,vimEndfunction,vimExecute,vimIsCommand,vimExtCmd,vimFor,vimFunction,vimFuncFold,vimGlobal,vimHighlight,vimLet,vimLoadkeymap,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimSet,vimSleep,vimSyntax,vimThrow,vimUnlet,vimUnmap,vimUserCmd,vimMenu,vimMenutranslate,@vim9CmdList
-syn cluster vim9CmdList
contains=vim9Class,vim9Const,vim9Enum,vim9Export,vim9Final,vim9For,vim9Interface,vim9Type,vim9Var
+syn cluster vim9CmdList
contains=vim9Abstract,vim9Class,vim9Const,vim9Enum,vim9Export,vim9Final,vim9For,vim9Interface,vim9Type,vim9Var
syn match vimCmdSep "[:|]\+" skipwhite
nextgroup=@vimCmdList,vimSubst1
syn match vimIsCommand "\<\%(\h\w*\|[23]mat\%[ch]\)\>" contains=vimCommand
syn match vimBang contained "!"
diff --git a/runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump
b/runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump
index c9df3e22a..58ba6abae 100644
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump
@@ -6,7 +6,7 @@
>:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63
|:|a+0#af5f00255&|b|c|l|e|a|r| +0#0000000&@66
|:|a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@64
-|:|a|b|s|t|r|a|c|t| @65
+|:|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&@65
|:|a+0#af5f00255&|l@1| +0#0000000&@70
|:|a+0#af5f00255&|m|e|n|u| +0#0000000&@68
|:|a+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64
diff --git a/runtime/syntax/testdir/dumps/vim9_ex_commands_33.dump
b/runtime/syntax/testdir/dumps/vim9_ex_commands_33.dump
index 0a53ea94c..8c374979c 100644
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_33.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_33.dump
@@ -13,7 +13,7 @@
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|b@1|r|e|v|i|a|t|e|
+0#0000000&@56
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|b|c|l|e|a|r|
+0#0000000&@59
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|b|o|v|e|l|e|f|t|
+0#0000000&@57
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a|b|s|t|r|a|c|t| @58
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|b|s|t|r|a|c|t|
+0#0000000&@58
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|l@1| +0#0000000&@63
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|m|e|n|u| +0#0000000&@61
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|n|o|r|e|m|e|n|u|
+0#0000000&@57
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 6a8e7adea..2c7d91e8f 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 Jan 01
+" Last Change: 2025 Jan 03
" Former Maintainer: Charles E. Campbell
" DO NOT CHANGE DIRECTLY.
@@ -28,7 +28,7 @@ syn cluster vimCommentGroup contains=vimTodo,@Spell
" regular vim commands {{{2
" GEN_SYN_VIM: vimCommand normal, START_STR='syn keyword vimCommand
contained', END_STR=''
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]
-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] debugg[reedy]
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] el[se] em[enu] en[dif]
endfo[r] endt[ry] endw[hile] ene[w] ev[al] ex exi[t] exu[sage] f[ile] files
filet[ype] filt[er] fin[d] fina[lly] fini[sh] fir[st] fix[del] fo[ld]
foldc[lose] foldd[oopen] folddoc[losed] foldo[pen] g[lobal] go[to] gr[ep]
grepa[dd] gu[i] gv[im] h[elp] helpc[lose] helpf[ind] helpg[rep] helpt[ags]
ha[rdcopy] hi[ghlight] hid[e] his[tory] ho[rizontal] ij[ump] il[ist] imp[ort]
int[ro] is[earch]
+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] debugg[reedy]
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] el[se] em[enu] en[dif]
endfo[r] endt[ry] endw[hile] ene[w] ev[al] ex exi[t] exu[sage] f[ile] files
filet[ype] filt[er] fin[d] fina[lly] fini[sh] fir[st] fix[del] fo[ld]
foldc[lose] foldd[oopen] folddoc[losed] foldo[pen] g[lobal] go[to] gr[ep]
grepa[dd] gu[i] gv[im] h[elp] helpc[lose] helpf[ind] helpg[rep] helpt[ags]
ha[rdcopy] hi[ghlight] hid[e] his[tory] hor[izontal] ij[ump] il[ist] imp[ort]
int[ro] is[earch]
syn keyword vimCommand contained isp[lit] j[oin] ju[mps] k kee[pmarks]
keepj[umps] keepp[atterns] 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] lh[elpgrep] 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] lua luad[o] luaf[ile] lv[imgrep]
lvimgrepa[dd] lw[indow] ls m[ove] ma[rk] mak[e] marks menut[ranslate]
mes[sages] mk[exrc] mks[ession] mksp[ell] mkv[imrc] mkvie[w] mod[e] mz[scheme]
mzf[ile] n[ext] nb[key]
syn keyword vimCommand contained 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] pc[lose] pe[rl] perld[o] 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] py[thon] pyd[o] pyf[ile] py3 py3d[o] python3 py3f[ile]
pyx pyxd[o] pythonx pyxf[ile] q[uit] quita[ll] qa[ll] r[ead] rec[over] red[o]
redi[r] redr[aw] redraws[tatus] redrawt[abline] 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]
syn keyword vimCommand contained 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] sor[t] sp[lit] 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] 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] tcl tcld[o] tclf[ile] te[aroff] ter[minal]
tf[irst] tj[ump]
@@ -103,8 +103,8 @@ syn case match
" GEN_SYN_VIM: vimFuncName, START_STR='syn keyword vimFuncName contained',
END_STR=''
syn keyword vimFuncName contained abs acos add and append appendbufline argc
argidx arglistid argv asin assert_beeps assert_equal assert_equalfile
assert_exception assert_fails assert_false assert_inrange assert_match
assert_nobeep assert_notequal assert_notmatch assert_report assert_true atan
atan2 autocmd_add autocmd_delete autocmd_get balloon_gettext balloon_show
balloon_split base64_decode base64_encode bindtextdomain blob2list browse
browsedir bufadd bufexists buflisted bufload bufloaded bufname bufnr bufwinid
bufwinnr byte2line byteidx byteidxcomp call ceil ch_canread ch_close
ch_close_in ch_evalexpr ch_evalraw ch_getbufnr ch_getjob ch_info ch_log
ch_logfile ch_open ch_read ch_readblob ch_readraw ch_sendexpr ch_sendraw
ch_setoptions ch_status changenr char2nr
syn keyword vimFuncName contained charclass charcol charidx chdir cindent
clearmatches col complete complete_add complete_check complete_info confirm
copy cos cosh count cscope_connection cursor debugbreak deepcopy delete
deletebufline did_filetype diff diff_filler diff_hlID digraph_get
digraph_getlist digraph_set digraph_setlist echoraw empty environ err_teapot
escape eval eventhandler executable execute exepath exists exists_compiled exp
expand expandcmd extend extendnew feedkeys filecopy filereadable filewritable
filter finddir findfile flatten flattennew float2nr floor fmod fnameescape
fnamemodify foldclosed foldclosedend foldlevel foldtext foldtextresult foreach
foreground fullcommand funcref function garbagecollect get getbufinfo
getbufline getbufoneline
-syn keyword vimFuncName contained getbufvar getcellpixels getcellwidths
getchangelist getchar getcharmod getcharpos getcharsearch getcharstr
getcmdcomplpat getcmdcompltype getcmdline getcmdpos getcmdprompt
getcmdscreenpos getcmdtype getcmdwintype getcompletion getcurpos
getcursorcharpos getcwd getenv getfontname getfperm getfsize getftime getftype
getimstatus getjumplist getline getloclist getmarklist getmatches getmousepos
getmouseshape getpid getpos getqflist getreg getreginfo getregion getregionpos
getregtype getscriptinfo gettabinfo gettabvar gettabwinvar gettagstack gettext
getwininfo getwinpos getwinposx getwinposy getwinvar glob glob2regpat globpath
has has_key haslocaldir hasmapto histadd histdel histget histnr hlID hlexists
hlget hlset hostname iconv
-syn keyword vimFuncName contained id indent index indexof input inputdialog
inputlist inputrestore inputsave inputsecret insert instanceof interrupt invert
isabsolutepath isdirectory isinf islocked isnan items job_getchannel job_info
job_setoptions job_start job_status job_stop join js_decode js_encode
json_decode json_encode keys keytrans len libcall libcallnr line line2byte
lispindent list2blob list2str listener_add listener_flush listener_remove
localtime log log10 luaeval map maparg mapcheck maplist mapnew mapset match
matchadd matchaddpos matcharg matchbufline matchdelete matchend matchfuzzy
matchfuzzypos matchlist matchstr matchstrlist matchstrpos max menu_info min
mkdir mode mzeval nextnonblank nr2char or pathshorten perleval popup_atcursor
popup_beval
+syn keyword vimFuncName contained getbufvar getcellpixels getcellwidths
getchangelist getchar getcharmod getcharpos getcharsearch getcharstr
getcmdcomplpat getcmdcompltype getcmdline getcmdpos getcmdprompt
getcmdscreenpos getcmdtype getcmdwintype getcompletion getcurpos
getcursorcharpos getcwd getenv getfontname getfperm getfsize getftime getftype
getimstatus getjumplist getline getloclist getmarklist getmatches getmousepos
getmouseshape getpid getpos getqflist getreg getreginfo getregion getregionpos
getregtype getscriptinfo getstacktrace gettabinfo gettabvar gettabwinvar
gettagstack gettext getwininfo getwinpos getwinposx getwinposy getwinvar glob
glob2regpat globpath has has_key haslocaldir hasmapto histadd histdel histget
histnr hlID hlexists hlget hlset hostname
+syn keyword vimFuncName contained iconv id indent index indexof input
inputdialog inputlist inputrestore inputsave inputsecret insert instanceof
interrupt invert isabsolutepath isdirectory isinf islocked isnan items
job_getchannel job_info job_setoptions job_start job_status job_stop join
js_decode js_encode json_decode json_encode keys keytrans len libcall libcallnr
line line2byte lispindent list2blob list2str listener_add listener_flush
listener_remove localtime log log10 luaeval map maparg mapcheck maplist mapnew
mapset match matchadd matchaddpos matcharg matchbufline matchdelete matchend
matchfuzzy matchfuzzypos matchlist matchstr matchstrlist matchstrpos max
menu_info min mkdir mode mzeval nextnonblank nr2char or pathshorten perleval
popup_atcursor popup_beval
syn keyword vimFuncName contained popup_clear popup_close popup_create
popup_dialog popup_filter_menu popup_filter_yesno popup_findecho popup_findinfo
popup_findpreview popup_getoptions popup_getpos popup_hide popup_list
popup_locate popup_menu popup_move popup_notification popup_setbuf
popup_setoptions popup_settext popup_show pow prevnonblank printf
prompt_getprompt prompt_setcallback prompt_setinterrupt prompt_setprompt
prop_add prop_add_list prop_clear prop_find prop_list prop_remove prop_type_add
prop_type_change prop_type_delete prop_type_get prop_type_list pum_getpos
pumvisible py3eval pyeval pyxeval rand range readblob readdir readdirex
readfile reduce reg_executing reg_recording reltime reltimefloat reltimestr
remote_expr remote_foreground remote_peek
syn keyword vimFuncName contained remote_read remote_send remote_startserver
remove rename repeat resolve reverse round rubyeval screenattr screenchar
screenchars screencol screenpos screenrow screenstring search searchcount
searchdecl searchpair searchpairpos searchpos server2client serverlist
setbufline setbufvar setcellwidths setcharpos setcharsearch setcmdline
setcmdpos setcursorcharpos setenv setfperm setline setloclist setmatches setpos
setqflist setreg settabvar settabwinvar settagstack setwinvar sha256
shellescape shiftwidth sign_define sign_getdefined sign_getplaced sign_jump
sign_place sign_placelist sign_undefine sign_unplace sign_unplacelist simplify
sin sinh slice sort sound_clear sound_playevent sound_playfile sound_stop
soundfold spellbadword spellsuggest
syn keyword vimFuncName contained split sqrt srand state str2float str2list
str2nr strcharlen strcharpart strchars strdisplaywidth strftime strgetchar
stridx string strlen strpart strptime strridx strtrans strutf16len strwidth
submatch substitute swapfilelist swapinfo swapname synID synIDattr synIDtrans
synconcealed synstack system systemlist tabpagebuflist tabpagenr tabpagewinnr
tagfiles taglist tan tanh tempname term_dumpdiff term_dumpload term_dumpwrite
term_getaltscreen term_getansicolors term_getattr term_getcursor term_getjob
term_getline term_getscrolled term_getsize term_getstatus term_gettitle
term_gettty term_list term_scrape term_sendkeys term_setansicolors term_setapi
term_setkill term_setrestore term_setsize term_start term_wait terminalprops
test_alloc_fail
@@ -241,7 +241,7 @@ syn case match
" All vimCommands are contained by vimIsCommand. {{{2
syn cluster vimCmdList
contains=vimAbb,vimAddress,vimAutoCmd,vimAugroup,vimBehave,vimCall,vimCatch,vimConst,vimDef,vimDefFold,vimDelcommand,@vimEcho,vimEnddef,vimEndfunction,vimExecute,vimIsCommand,vimExtCmd,vimFor,vimFunction,vimFuncFold,vimGlobal,vimHighlight,vimLet,vimLoadkeymap,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimSet,vimSleep,vimSyntax,vimThrow,vimUnlet,vimUnmap,vimUserCmd,vimMenu,vimMenutranslate,@vim9CmdList
-syn cluster vim9CmdList
contains=vim9Class,vim9Const,vim9Enum,vim9Export,vim9Final,vim9For,vim9Interface,vim9Type,vim9Var
+syn cluster vim9CmdList
contains=vim9Abstract,vim9Class,vim9Const,vim9Enum,vim9Export,vim9Final,vim9For,vim9Interface,vim9Type,vim9Var
syn match vimCmdSep "[:|]\+" skipwhite
nextgroup=@vimCmdList,vimSubst1
syn match vimIsCommand "\<\%(\h\w*\|[23]mat\%[ch]\)\>" contains=vimCommand
syn match vimBang contained "!"
--
--
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/E1tTknI-005GCv-0r%40256bit.org.
