diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2025-03-09 16:57:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-09 16:57:08 +0800 |
| commit | d414d0e8eab8906db19e2f83b9983ce8727f8de6 (patch) | |
| tree | 60ec82271ba46ac183b3098dfaf24b7e5ce2a6cb /runtime | |
| parent | 2a53ccdb42a1878a246d8ceca48ef50163931198 (diff) | |
| download | rneovim-d414d0e8eab8906db19e2f83b9983ce8727f8de6.tar.gz rneovim-d414d0e8eab8906db19e2f83b9983ce8727f8de6.tar.bz2 rneovim-d414d0e8eab8906db19e2f83b9983ce8727f8de6.zip | |
vim-patch:9.1.1187: matchparen plugin wrong highlights shell case statement (#32798)
Problem: matchparen plugin wrong highlights shell case statement
(Swudu Susuwu)
Solution: return early, if we are in a shSnglCase syntax element
The shell syntax element "case $var in foobar)" uses closing parenthesis
but there is no corresponding opening parenthesis for that syntax
element. However matchparen is not aware of such things and will happily
try to match just the next opening parenthesis.
So let's just add a way to opt out for such cases. In this case, use the
syntax state to check if the closing parenthesis belongs to the syntax
item "shSnglCase" and if it is, do not try to find a corresponding
opening parenthesis.
Since inspecting the syntax state might be expensive, put the whole
check behind a filetype test, so that matchparen will only perform this
particular check, when it knows the current buffer is a "sh" filetype.
fixes: vim/vim#16801
closes: vim/vim#16831
https://github.com/vim/vim/commit/9102ac11ab3938ec8c15bfebd00d2f91d3f1cd6c
Co-authored-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/plugin/matchparen.vim | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim index 13d1b6824f..079cc668f0 100644 --- a/runtime/plugin/matchparen.vim +++ b/runtime/plugin/matchparen.vim @@ -1,6 +1,6 @@ " Vim plugin for showing matching parens " Maintainer: The Vim Project <https://github.com/vim/vim> -" Last Change: 2024 May 18 +" Last Change: 2025 Mar 08 " Former Maintainer: Bram Moolenaar <Bram@vim.org> " Exit quickly when: @@ -114,6 +114,17 @@ func s:Highlight_Matching_Pair() \ .. 'string\|character\|singlequote\|escape\|symbol\|comment' \ .. "') != -1" else + " do not attempt to match when the syntax item where the cursor is + " indicates there does not exist a matching parenthesis, e.g. for shells + " case statement: "case $var in foobar)" + " + " add the check behind a filetype check, so it only needs to be + " evaluated for certain filetypes + if ['sh']->index(&filetype) >= 0 && + \ synstack(".", col("."))->indexof({_, id -> synIDattr(id, "name") + \ =~? "shSnglCase"}) >= 0 + return + endif " Build an expression that detects whether the current cursor position is " in certain syntax types (string, comment, etc.), for use as " searchpairpos()'s skip argument. |