runtime(vim): correctly handle ! attribute for augroup/doautocmd/doautoall #14906
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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. Signed-off-by: Christian Brabandt <[email protected]>
chrisbra
changed the title
|
Thanks. We need to match --- 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 vimOperPatch on top of your changes. |
|
I also found a stash attempting to fix a number of issues with |
|
do you want to take over this one then? Or shall I squash your patch on top of mine and go ahead merging? |
|
I can take it if you're not in a hurry for the intermediate fix. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I noticed that
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 VimEventListIn 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