From 5d2b6f4fa0dc51e8beadd9c3194ac210e8977a00 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 11 Feb 2025 09:07:47 +0800 Subject: vim-patch:9.1.1095: tests: matchparen plugin test wrongly named (#32397) Problem: tests: matchparen plugin test wrongly named (zeertzjq) Solution: rename test_matchparen to test_plugin_matchparen to be consistent with the other plugin tests related: vim/vim#16599 https://github.com/vim/vim/commit/7de6b1bb5687b94369dda82a9648109d7d6832b7 Co-authored-by: Christian Brabandt --- test/old/testdir/test_matchparen.vim | 142 ---------------------------- test/old/testdir/test_plugin_matchparen.vim | 142 ++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 142 deletions(-) delete mode 100644 test/old/testdir/test_matchparen.vim create mode 100644 test/old/testdir/test_plugin_matchparen.vim diff --git a/test/old/testdir/test_matchparen.vim b/test/old/testdir/test_matchparen.vim deleted file mode 100644 index 7d80e43046..0000000000 --- a/test/old/testdir/test_matchparen.vim +++ /dev/null @@ -1,142 +0,0 @@ -" Test for the matchparen plugin - -if !has('gui_running') && has('unix') - " set term=ansi -endif - -source view_util.vim -source check.vim -source screendump.vim - -" Test for scrolling that modifies buffer during visual block -func Test_visual_block_scroll() - CheckScreendump - - let lines =<< trim END - source $VIMRUNTIME/plugin/matchparen.vim - set scrolloff=1 - call setline(1, ['a', 'b', 'c', 'd', 'e', '', '{', '}', '{', 'f', 'g', '}']) - call cursor(5, 1) - END - - let filename = 'Xvisualblockmodifiedscroll' - call writefile(lines, filename, 'D') - - let buf = RunVimInTerminal('-S '.filename, #{rows: 7}) - call term_sendkeys(buf, "V\\") - - call VerifyScreenDump(buf, 'Test_display_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\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()\:\") - call VerifyScreenDump(buf, 'Test_matchparen_clear_highlight_2', {}) - - call term_sendkeys(buf, "\:\") - call VerifyScreenDump(buf, 'Test_matchparen_clear_highlight_1', {}) - - call term_sendkeys(buf, "\:\") - call VerifyScreenDump(buf, 'Test_matchparen_clear_highlight_2', {}) - - 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()\:\") - 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 - - let lines =<< trim END - source $VIMRUNTIME/plugin/matchparen.vim - set completeopt=menuone - call setline(1, ['aa', 'aaa', 'aaaa', '(a)']) - call cursor(4, 3) - END - - let filename = 'Xmatchparen' - call writefile(lines, filename, 'D') - - let buf = RunVimInTerminal('-S '.filename, #{rows: 10}) - call term_sendkeys(buf, "i\\") - - call VerifyScreenDump(buf, 'Test_matchparen_pum_clear_1', {}) - - call StopVimInTerminal(buf) -endfunc - -" Test that matchparen works with multibyte chars in 'matchpairs' -func Test_matchparen_mbyte() - CheckScreendump - - let lines =<< trim END - source $VIMRUNTIME/plugin/matchparen.vim - call setline(1, ['aaaaaaaa（', 'bbbb）cc']) - set matchpairs+=（:） - END - - call writefile(lines, 'XmatchparenMbyte', 'D') - let buf = RunVimInTerminal('-S XmatchparenMbyte', #{rows: 10}) - call VerifyScreenDump(buf, 'Test_matchparen_mbyte_1', {}) - call term_sendkeys(buf, "$") - call VerifyScreenDump(buf, 'Test_matchparen_mbyte_2', {}) - call term_sendkeys(buf, "j") - call VerifyScreenDump(buf, 'Test_matchparen_mbyte_3', {}) - call term_sendkeys(buf, "2h") - call VerifyScreenDump(buf, 'Test_matchparen_mbyte_4', {}) - call term_sendkeys(buf, "0") - call VerifyScreenDump(buf, 'Test_matchparen_mbyte_5', {}) - call term_sendkeys(buf, "kA") - call VerifyScreenDump(buf, 'Test_matchparen_mbyte_6', {}) - call term_sendkeys(buf, "\") - call VerifyScreenDump(buf, 'Test_matchparen_mbyte_7', {}) - call term_sendkeys(buf, "\") - call VerifyScreenDump(buf, 'Test_matchparen_mbyte_8', {}) - - call StopVimInTerminal(buf) -endfunc - -" vim: shiftwidth=2 sts=2 expandtab diff --git a/test/old/testdir/test_plugin_matchparen.vim b/test/old/testdir/test_plugin_matchparen.vim new file mode 100644 index 0000000000..7d80e43046 --- /dev/null +++ b/test/old/testdir/test_plugin_matchparen.vim @@ -0,0 +1,142 @@ +" Test for the matchparen plugin + +if !has('gui_running') && has('unix') + " set term=ansi +endif + +source view_util.vim +source check.vim +source screendump.vim + +" Test for scrolling that modifies buffer during visual block +func Test_visual_block_scroll() + CheckScreendump + + let lines =<< trim END + source $VIMRUNTIME/plugin/matchparen.vim + set scrolloff=1 + call setline(1, ['a', 'b', 'c', 'd', 'e', '', '{', '}', '{', 'f', 'g', '}']) + call cursor(5, 1) + END + + let filename = 'Xvisualblockmodifiedscroll' + call writefile(lines, filename, 'D') + + let buf = RunVimInTerminal('-S '.filename, #{rows: 7}) + call term_sendkeys(buf, "V\\") + + call VerifyScreenDump(buf, 'Test_display_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\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()\:\") + call VerifyScreenDump(buf, 'Test_matchparen_clear_highlight_2', {}) + + call term_sendkeys(buf, "\:\") + call VerifyScreenDump(buf, 'Test_matchparen_clear_highlight_1', {}) + + call term_sendkeys(buf, "\:\") + call VerifyScreenDump(buf, 'Test_matchparen_clear_highlight_2', {}) + + 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()\:\") + 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 + + let lines =<< trim END + source $VIMRUNTIME/plugin/matchparen.vim + set completeopt=menuone + call setline(1, ['aa', 'aaa', 'aaaa', '(a)']) + call cursor(4, 3) + END + + let filename = 'Xmatchparen' + call writefile(lines, filename, 'D') + + let buf = RunVimInTerminal('-S '.filename, #{rows: 10}) + call term_sendkeys(buf, "i\\") + + call VerifyScreenDump(buf, 'Test_matchparen_pum_clear_1', {}) + + call StopVimInTerminal(buf) +endfunc + +" Test that matchparen works with multibyte chars in 'matchpairs' +func Test_matchparen_mbyte() + CheckScreendump + + let lines =<< trim END + source $VIMRUNTIME/plugin/matchparen.vim + call setline(1, ['aaaaaaaa（', 'bbbb）cc']) + set matchpairs+=（:） + END + + call writefile(lines, 'XmatchparenMbyte', 'D') + let buf = RunVimInTerminal('-S XmatchparenMbyte', #{rows: 10}) + call VerifyScreenDump(buf, 'Test_matchparen_mbyte_1', {}) + call term_sendkeys(buf, "$") + call VerifyScreenDump(buf, 'Test_matchparen_mbyte_2', {}) + call term_sendkeys(buf, "j") + call VerifyScreenDump(buf, 'Test_matchparen_mbyte_3', {}) + call term_sendkeys(buf, "2h") + call VerifyScreenDump(buf, 'Test_matchparen_mbyte_4', {}) + call term_sendkeys(buf, "0") + call VerifyScreenDump(buf, 'Test_matchparen_mbyte_5', {}) + call term_sendkeys(buf, "kA") + call VerifyScreenDump(buf, 'Test_matchparen_mbyte_6', {}) + call term_sendkeys(buf, "\") + call VerifyScreenDump(buf, 'Test_matchparen_mbyte_7', {}) + call term_sendkeys(buf, "\") + call VerifyScreenDump(buf, 'Test_matchparen_mbyte_8', {}) + + call StopVimInTerminal(buf) +endfunc + +" vim: shiftwidth=2 sts=2 expandtab -- cgit