diff options
-rw-r--r-- | runtime/plugin/matchparen.vim | 6 | ||||
-rw-r--r-- | src/testdir/dumps/Test_matchparen_clear_highlight_1.dump | 5 | ||||
-rw-r--r-- | src/testdir/dumps/Test_matchparen_clear_highlight_2.dump | 5 | ||||
-rw-r--r-- | src/testdir/test_display.vim | 31 | ||||
-rw-r--r-- | src/version.c | 2 |
5 files changed, 46 insertions, 3 deletions
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim index ce2225c5f8..eb4a9ecf7c 100644 --- a/runtime/plugin/matchparen.vim +++ b/runtime/plugin/matchparen.vim @@ -1,6 +1,6 @@ " Vim plugin for showing matching parens " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2021 Apr 08 +" Last Change: 2022 Nov 28 " Exit quickly when: " - this plugin was already loaded (or disabled) @@ -19,8 +19,8 @@ endif augroup matchparen " Replace all matchparen autocommands - autocmd! CursorMoved,CursorMovedI,WinEnter,WinScrolled * call s:Highlight_Matching_Pair() - autocmd! WinLeave * call s:Remove_Matches() + autocmd! CursorMoved,CursorMovedI,WinEnter,BufWinEnter,WinScrolled * call s:Highlight_Matching_Pair() + autocmd! WinLeave,BufLeave * call s:Remove_Matches() if exists('##TextChanged') autocmd! TextChanged,TextChangedI * call s:Highlight_Matching_Pair() endif diff --git a/src/testdir/dumps/Test_matchparen_clear_highlight_1.dump b/src/testdir/dumps/Test_matchparen_clear_highlight_1.dump new file mode 100644 index 0000000000..1a962750d7 --- /dev/null +++ b/src/testdir/dumps/Test_matchparen_clear_highlight_1.dump @@ -0,0 +1,5 @@ +>(+0(ffff15|)| +0&#ffffff0@72 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|,|1| @10|A|l@1| diff --git a/src/testdir/dumps/Test_matchparen_clear_highlight_2.dump b/src/testdir/dumps/Test_matchparen_clear_highlight_2.dump new file mode 100644 index 0000000000..c3f93fab20 --- /dev/null +++ b/src/testdir/dumps/Test_matchparen_clear_highlight_2.dump @@ -0,0 +1,5 @@ +>a+0&#ffffff0@1| @72 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|,|1| @10|A|l@1| diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim index 4364f03fb2..abf1cd0cd0 100644 --- a/src/testdir/test_display.vim +++ b/src/testdir/test_display.vim @@ -237,6 +237,37 @@ func Test_visual_block_scroll() call StopVimInTerminal(buf) endfunc +" Test for clearing paren highlight when switching buffers +func Test_matchparen_clear_highlight() + CheckScreendump + + let lines =<< trim END + source $VIMRUNTIME/plugin/matchparen.vim + set hidden + call setline(1, ['()']) + normal 0 + + func OtherBuffer() + enew + exe "normal iaa\<Esc>0" + endfunc + END + call writefile(lines, 'XMatchparenClear', 'D') + let buf = RunVimInTerminal('-S XMatchparenClear', #{rows: 5}) + call VerifyScreenDump(buf, 'Test_matchparen_clear_highlight_1', {}) + + call term_sendkeys(buf, ":call OtherBuffer()\<CR>:\<Esc>") + call VerifyScreenDump(buf, 'Test_matchparen_clear_highlight_2', {}) + + call term_sendkeys(buf, "\<C-^>:\<Esc>") + call VerifyScreenDump(buf, 'Test_matchparen_clear_highlight_1', {}) + + call term_sendkeys(buf, "\<C-^>:\<Esc>") + call VerifyScreenDump(buf, 'Test_matchparen_clear_highlight_2', {}) + + call StopVimInTerminal(buf) +endfunc + func Test_display_scroll_at_topline() CheckScreendump diff --git a/src/version.c b/src/version.c index f26f91a44a..78df0d8c6d 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 969, +/**/ 968, /**/ 967, |