diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-03-11 21:38:58 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-03-11 21:38:58 +0100 |
| commit | 49ffb6b428e1e053446ec0209558a8f9d0963ae7 (patch) | |
| tree | faf85f9b41f141b60d20ac9c3777336d3c3b67b9 | |
| parent | 5406eb8722bddb6a04876956f9a53c1752994851 (diff) | |
patch 9.1.0167: Changing buffer in another window causes it to show matchparenv9.1.0167
Problem: Changing buffer in another window using win_execute() causes
it to show matchparen (after 9.0.0969).
Solution: Delay highlighting with SafeState in BufWinEnter.
(zeertzjq)
closes: #14177
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/plugin/matchparen.vim | 3 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_matchparen_win_execute_1.dump | 5 | ||||
| -rw-r--r-- | src/testdir/test_matchparen.vim | 25 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 34 insertions, 1 deletions
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim index 4235a0d39b..96c54ee6d8 100644 --- a/runtime/plugin/matchparen.vim +++ b/runtime/plugin/matchparen.vim @@ -22,7 +22,8 @@ let s:has_matchaddpos = exists('*matchaddpos') augroup matchparen " Replace all matchparen autocommands - autocmd! CursorMoved,CursorMovedI,WinEnter,BufWinEnter,WinScrolled * call s:Highlight_Matching_Pair() + autocmd! CursorMoved,CursorMovedI,WinEnter,WinScrolled * call s:Highlight_Matching_Pair() + autocmd! BufWinEnter * autocmd SafeState * ++once call s:Highlight_Matching_Pair() autocmd! WinLeave,BufLeave * call s:Remove_Matches() if exists('##TextChanged') autocmd! TextChanged,TextChangedI * call s:Highlight_Matching_Pair() diff --git a/src/testdir/dumps/Test_matchparen_win_execute_1.dump b/src/testdir/dumps/Test_matchparen_win_execute_1.dump new file mode 100644 index 0000000000..75ab21091f --- /dev/null +++ b/src/testdir/dumps/Test_matchparen_win_execute_1.dump @@ -0,0 +1,5 @@ +>{+0(ffff15|}| +0&#ffffff0@72 +|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|1| @11|A|l@1 +|{+0&&|}| @72 +|[+1&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|1| @11|A|l@1 +| +0&&@74 diff --git a/src/testdir/test_matchparen.vim b/src/testdir/test_matchparen.vim index 6d09b6f30a..70aa38ffdd 100644 --- a/src/testdir/test_matchparen.vim +++ b/src/testdir/test_matchparen.vim @@ -61,6 +61,31 @@ func Test_matchparen_clear_highlight() call StopVimInTerminal(buf) endfunc +" Test for matchparen highlight when switching buffer in win_execute() +func Test_matchparen_win_execute() + CheckScreendump + + let lines =<< trim END + source $VIMRUNTIME/plugin/matchparen.vim + let s:win = win_getid() + call setline(1, '{}') + split + + func SwitchBuf() + call win_execute(s:win, 'enew | buffer #') + endfunc + END + call writefile(lines, 'XMatchparenWinExecute', 'D') + let buf = RunVimInTerminal('-S XMatchparenWinExecute', #{rows: 5}) + call VerifyScreenDump(buf, 'Test_matchparen_win_execute_1', {}) + + " Switching buffer away and back shouldn't change matchparen highlight. + call term_sendkeys(buf, ":call SwitchBuf()\<CR>:\<Esc>") + call VerifyScreenDump(buf, 'Test_matchparen_win_execute_1', {}) + + call StopVimInTerminal(buf) +endfunc + " Test for scrolling that modifies buffer during visual block func Test_matchparen_pum_clear() CheckScreendump diff --git a/src/version.c b/src/version.c index 8f06552b17..7279d7165d 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 167, +/**/ 166, /**/ 165, |