Mercurial > vim
comparison runtime/syntax/generator/gen_syntax_vim.vim @ 34664:af61243e5aeb
runtime(vim): Update base-syntax, match empty blob and :abclear modifiers (#14318)
Commit: https://github.com/vim/vim/commit/982e191b38b493d148d73871a724381214e4c62f
Author: dkearns <dougkearns@gmail.com>
Date: Thu Mar 28 20:06:03 2024 +1100
runtime(vim): Update base-syntax, match empty blob and :abclear modifiers (https://github.com/vim/vim/issues/14318)
- Match empty blob literals.
- Match modifier arguments to :abclear commands.
Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 28 Mar 2024 10:15:07 +0100 |
parents | 1790ce961c7d |
children | 83cd18134b6f |
comparison
equal
deleted
inserted
replaced
34663:b4b4abc26a9c | 34664:af61243e5aeb |
---|---|
1 " Vim syntax file generator | 1 " Vim syntax file generator |
2 " Language: Vim script | 2 " Language: Vim script |
3 " Maintainer: Hirohito Higashi (h_east) | 3 " Maintainer: Hirohito Higashi (h_east) |
4 " URL: https://github.com/vim-jp/syntax-vim-ex | 4 " URL: https://github.com/vim-jp/syntax-vim-ex |
5 " Last Change: 2024 Mar 14 | 5 " Last Change: 2024 Mar 28 |
6 " Version: 2.0.6 | 6 " Version: 2.0.7 |
7 | 7 |
8 let s:keepcpo= &cpo | 8 let s:keepcpo= &cpo |
9 set cpo&vim | 9 set cpo&vim |
10 | 10 |
11 language C | 11 language C |
267 " 2: abbrev (without un) | 267 " 2: abbrev (without un) |
268 " 3: menu | 268 " 3: menu |
269 " 4: map | 269 " 4: map |
270 " 5: mapclear | 270 " 5: mapclear |
271 " 6: unmap | 271 " 6: unmap |
272 " 7: abclear | |
272 " 99: (Exclude registration of "syn keyword") | 273 " 99: (Exclude registration of "syn keyword") |
274 let ab_prefix = '^[ci]\?' | |
273 let menu_prefix = '^\%([acinostvx]\?\|tl\)' | 275 let menu_prefix = '^\%([acinostvx]\?\|tl\)' |
274 let map_prefix = '^[acilnostvx]\?' | 276 let map_prefix = '^[acilnostvx]\?' |
275 let exclude_list = [ | 277 let exclude_list = [ |
276 \ 'map', 'mapclear', | 278 \ 'map', 'mapclear', |
277 \ 'substitute', 'smagic', 'snomagic', | 279 \ 'substitute', 'smagic', 'snomagic', |
290 | 292 |
291 if index(exclude_list, a:cmd_name) != -1 | 293 if index(exclude_list, a:cmd_name) != -1 |
292 let ret = 99 | 294 let ret = 99 |
293 elseif a:cmd_name =~# '^\%(\%(un\)\?abbreviate\|noreabbrev\|\l\%(nore\|un\)\?abbrev\)$' | 295 elseif a:cmd_name =~# '^\%(\%(un\)\?abbreviate\|noreabbrev\|\l\%(nore\|un\)\?abbrev\)$' |
294 let ret = 2 | 296 let ret = 2 |
297 elseif a:cmd_name =~# ab_prefix . 'abclear$' | |
298 let ret = 7 | |
295 elseif a:cmd_name =~# menu_prefix . '\%(nore\|un\)\?menu$' | 299 elseif a:cmd_name =~# menu_prefix . '\%(nore\|un\)\?menu$' |
296 let ret = 3 | 300 let ret = 3 |
297 elseif a:cmd_name =~# map_prefix . '\%(nore\)\?map$' | 301 elseif a:cmd_name =~# map_prefix . '\%(nore\)\?map$' |
298 let ret = 4 | 302 let ret = 4 |
299 elseif a:cmd_name =~# map_prefix . 'mapclear$' | 303 elseif a:cmd_name =~# map_prefix . 'mapclear$' |
616 " vimCommand - abbrev | 620 " vimCommand - abbrev |
617 let kword = 'vimCommand' | 621 let kword = 'vimCommand' |
618 let li = a:vim_info.cmd | 622 let li = a:vim_info.cmd |
619 let lnum = s:search_and_check(kword . ' abbrev', base_fname, str_info) | 623 let lnum = s:search_and_check(kword . ' abbrev', base_fname, str_info) |
620 let lnum = s:append_syn_vimcmd(lnum, str_info, li, 2) | 624 let lnum = s:append_syn_vimcmd(lnum, str_info, li, 2) |
625 let lnum = s:search_and_check(kword . ' abclear', base_fname, str_info) | |
626 let lnum = s:append_syn_vimcmd(lnum, str_info, li, 7) | |
621 " vimCommand - map | 627 " vimCommand - map |
622 let lnum = s:search_and_check(kword . ' map', base_fname, str_info) | 628 let lnum = s:search_and_check(kword . ' map', base_fname, str_info) |
623 let lnum = s:append_syn_vimcmd(lnum, str_info, li, 4) | 629 let lnum = s:append_syn_vimcmd(lnum, str_info, li, 4) |
624 let lnum = s:search_and_check(kword . ' mapclear', base_fname, str_info) | 630 let lnum = s:search_and_check(kword . ' mapclear', base_fname, str_info) |
625 let lnum = s:append_syn_vimcmd(lnum, str_info, li, 5) | 631 let lnum = s:append_syn_vimcmd(lnum, str_info, li, 5) |