runtime(vim): update vim generator syntax script
Commit:
https://github.com/vim/vim/commit/f27e80a6e183a617dd885311871fd4eaa6075d16
Author: h-east <[email protected]>
Date: Mon Dec 30 15:40:24 2024 +0100
runtime(vim): update vim generator syntax script
* include the base64* functions
* allow to shorten finally
closes: #16346
Signed-off-by: h-east <[email protected]>
Signed-off-by: Doug Kearns <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/syntax/generator/gen_syntax_vim.vim
b/runtime/syntax/generator/gen_syntax_vim.vim
index 1badb350f..ab63df76b 100644
--- a/runtime/syntax/generator/gen_syntax_vim.vim
+++ b/runtime/syntax/generator/gen_syntax_vim.vim
@@ -134,9 +134,6 @@ function s:parse_vim_command(cmd)
for idx in range(1,
strlen(lcmd[key][my]))
let matched = 0
for pre in range(my - 1, 0, -1)
- if pre == my
- continue
- endif
" Avoiding conflicts
shortened command and special commands
" - weird abbreviations
for delete. (See :help :d)
" - k{char} is used as
mark. (See :help :k)
@@ -197,6 +194,16 @@ function s:parse_vim_command(cmd)
let item.syn_str = item.name
call add(a:cmd, copy(item))
+ " ":fina" means ":finally" in legacy script, for backwards compatibility.
+ " (From Vim source code find_ex_command() in ex_docmd.c)
+ call map(a:cmd, {_, v ->
+ \ v.name ==# 'final' ?
+ \ extend(copy(v), {'omit_idx': -1,
'syn_str': v.name}) :
+ \ v.name ==# 'finally' ?
+ \ extend(copy(v), {'omit_idx': 3,
'syn_str': 'fina[lly]'}) :
+ \ v
+ \ })
+
if empty(a:cmd)
throw 'cmd is empty'
endif
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 0d1ca85d5..cc88b0574 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 <[email protected]>
-" Last Change: 2024 Dec 29
+" Last Change: 2024 Dec 30
" 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] abs[tract] 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]
-syn keyword vimCommand contained conf[irm] 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] finall[y] 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]
+syn keyword vimCommand contained conf[irm] 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]
syn keyword vimCommand contained int[ro] is[earch] 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]
syn keyword vimCommand contained 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] 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]
syn keyword vimCommand contained 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] 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]
@@ -101,15 +101,15 @@ syn case match
" Function Names {{{2
" 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 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
charclass charcol charidx
-syn keyword vimFuncName contained 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
getbufvar getcellpixels getcellwidths
-syn keyword vimFuncName contained 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 id indent index indexof input inputdialog
-syn keyword vimFuncName contained 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 popup_clear popup_close
popup_create popup_dialog
-syn keyword vimFuncName contained 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 remote_read remote_send
remote_startserver remove
-syn keyword vimFuncName contained 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 split sqrt srand state str2float
str2list
-syn keyword vimFuncName contained 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 test_autochdir
test_feedinput
-syn keyword vimFuncName contained test_garbagecollect_now
test_garbagecollect_soon test_getvalue test_gui_event test_ignore_error
test_mswin_event test_null_blob test_null_channel test_null_dict
test_null_function test_null_job test_null_list test_null_partial
test_null_string test_option_not_set test_override test_refcount test_setmouse
test_settime test_srand_seed test_unknown test_void timer_info timer_pause
timer_start timer_stop timer_stopall tolower toupper tr trim trunc type
typename undofile undotree uniq utf16idx values virtcol virtcol2col visualmode
wildmenumode win_execute win_findbuf win_getid win_gettype win_gotoid
win_id2tabwin win_id2win win_move_separator win_move_statusline win_screenpos
win_splitmove winbufnr wincol windowsversion winheight winlayout
-syn keyword vimFuncName contained winline winnr winrestcmd winrestview
winsaveview winwidth wordcount writefile xor
+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 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
+syn keyword vimFuncName contained test_autochdir test_feedinput
test_garbagecollect_now test_garbagecollect_soon test_getvalue test_gui_event
test_ignore_error test_mswin_event test_null_blob test_null_channel
test_null_dict test_null_function test_null_job test_null_list
test_null_partial test_null_string test_option_not_set test_override
test_refcount test_setmouse test_settime test_srand_seed test_unknown test_void
timer_info timer_pause timer_start timer_stop timer_stopall tolower toupper tr
trim trunc type typename undofile undotree uniq utf16idx values virtcol
virtcol2col visualmode wildmenumode win_execute win_findbuf win_getid
win_gettype win_gotoid win_id2tabwin win_id2win win_move_separator
win_move_statusline win_screenpos win_splitmove winbufnr wincol
+syn keyword vimFuncName contained windowsversion winheight winlayout winline
winnr winrestcmd winrestview winsaveview winwidth wordcount writefile xor
"--- syntax here and above generated by mkvimvim ---
" Special Vim Highlighting (not automatic) {{{1
--
--
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 [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1tSH0z-00Dw8x-Rl%40256bit.org.
