[vim/vim] runtime(vim): correctly handle ! attribute for augroup/doautocmd/doautoall (PR #14906)
Christian Brabandt
…toall
I noticed that
:autocmd! FooBar
:augroup! FooBar
looks slightly different to how the ! is drawn. While the ! for the autocmd case is shown in the same color as autocmd, for :augroup is is shown as VimEventList
In addition, the vim syntax seems to accept doautocmd! and doautoall! (with bang attribute) even so this is not valid.
So let's fix all of those and mark the ! as an error for the the :doautocmd/doautoall case.
cc @dkearns
You can view, comment on, or merge this pull request online at:
https://github.com/vim/vim/pull/14906
Commit Summary
- e9282d2 runtime(vim): correctly handle ! attrubute for augroup/doautocmd/doautoall
File Changes
(6 files)
- M runtime/syntax/generator/vim.vim.base (9)
- M runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump (2)
- A runtime/syntax/testdir/dumps/vim_ex_augroup_01.dump (20)
- M runtime/syntax/testdir/dumps/vim_ex_augroup_99.dump (18)
- M runtime/syntax/testdir/input/vim_ex_augroup.vim (6)
- M runtime/syntax/vim.vim (11)
Patch Links:
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
dkearns
Thanks. We need to match vimAutoEventList after a ! so I'd add a dedicated bang group for autocmds like the following.
--- vim.vim 2024-06-04 13:18:27.530178121 +1000 +++ /tmp/vim2.vim 2024-06-04 20:20:11.472645559 +1000 @@ -565,8 +565,9 @@ if !exists("g:vimsyn_noerror") syn match vimAutoBangError contained "!" skipwhite nextgroup=vimAutoEventList endif -syn keyword vimAutoCmd au[tocmd] skipwhite nextgroup=vimAugroupBang,vimAutoEventList +syn keyword vimAutoCmd au[tocmd] skipwhite nextgroup=vimAutoCmdBang,vimAutoEventList syn keyword vimAutoCmd do[autocmd] doautoa[ll] skipwhite nextgroup=vimAutoBangError,vimAutoEventList +syn match vimAutoCmdBang contained "\a\@1<=!" skipwhite nextgroup=vimAutoEventList syn match vimAutoCmdMod "\(++\)\=\(once\|nested\)" skipwhite nextgroup=vimAutoCmdBlock syn region vimAutoCmdBlock contained matchgroup=vimSep start="{" end="}" contains=@vimDefBodyList @@ -1106,6 +1107,7 @@ hi def link vimAugroupError vimError hi def link vimAugroupKey vimCommand hi def link vimAutoCmd vimCommand + hi def link vimAutoCmdBang vimBang hi def link vimAutoEvent Type hi def link vimAutoCmdMod Special hi def link vimBang vimOper
Patch on top of your changes.
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
dkearns
I also found a stash attempting to fix a number of issues with :au. I'll see what I can salvage...
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
Christian Brabandt
do you want to take over this one then? Or shall I squash your patch on top of mine and go ahead merging?
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
dkearns
I can take it if you're not in a hurry for the intermediate fix.
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
Christian Brabandt
chrisbra left a comment (vim/vim#14906)closing as stalled
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.