To: vim_dev@googlegroups.com Subject: Patch 8.2.1177 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1177 Problem: Terminal2 test sometimes hangs in the GUI. Solution: Move some tests to other files to further locate the problem. Set the GUI to a fixed screen size. Files: src/testdir/test_terminal.vim, src/testdir/test_terminal2.vim, src/testdir/test_terminal3.vim, src/testdir/Make_all.mak, src/testdir/runtest.vim *** ../vim-8.2.1176/src/testdir/test_terminal.vim 2020-07-01 21:53:33.411476027 +0200 --- src/testdir/test_terminal.vim 2020-07-11 13:07:29.994243458 +0200 *************** *** 1,6 **** " Tests for the terminal window. " This is split in two, because it can take a lot of time. ! " See test_terminal2.vim for further tests. source check.vim CheckFeature terminal --- 1,6 ---- " Tests for the terminal window. " This is split in two, because it can take a lot of time. ! " See test_terminal2.vim and test_terminal3.vim for further tests. source check.vim CheckFeature terminal *************** *** 1359,1363 **** --- 1359,1829 ---- set statusline= endfunc + func Api_drop_common(options) + call assert_equal(1, winnr('$')) + + " Use the title termcap entries to output the escape sequence. + call writefile([ + \ 'set title', + \ 'exe "set t_ts=\]51; t_fs=\x07"', + \ 'let &titlestring = ''["drop","Xtextfile"' . a:options . ']''', + \ 'redraw', + \ "set t_ts=", + \ ], 'Xscript') + let buf = RunVimInTerminal('-S Xscript', {}) + call WaitFor({-> bufnr('Xtextfile') > 0}) + call assert_equal('Xtextfile', expand('%:t')) + call assert_true(winnr('$') >= 3) + return buf + endfunc + + func Test_terminal_api_drop_newwin() + CheckRunVimInTerminal + let buf = Api_drop_common('') + call assert_equal(0, &bin) + call assert_equal('', &fenc) + + call StopVimInTerminal(buf) + call delete('Xscript') + bwipe Xtextfile + endfunc + + func Test_terminal_api_drop_newwin_bin() + CheckRunVimInTerminal + let buf = Api_drop_common(',{"bin":1}') + call assert_equal(1, &bin) + + call StopVimInTerminal(buf) + call delete('Xscript') + bwipe Xtextfile + endfunc + + func Test_terminal_api_drop_newwin_binary() + CheckRunVimInTerminal + let buf = Api_drop_common(',{"binary":1}') + call assert_equal(1, &bin) + + call StopVimInTerminal(buf) + call delete('Xscript') + bwipe Xtextfile + endfunc + + func Test_terminal_api_drop_newwin_nobin() + CheckRunVimInTerminal + set binary + let buf = Api_drop_common(',{"nobin":1}') + call assert_equal(0, &bin) + + call StopVimInTerminal(buf) + call delete('Xscript') + bwipe Xtextfile + set nobinary + endfunc + + func Test_terminal_api_drop_newwin_nobinary() + CheckRunVimInTerminal + set binary + let buf = Api_drop_common(',{"nobinary":1}') + call assert_equal(0, &bin) + + call StopVimInTerminal(buf) + call delete('Xscript') + bwipe Xtextfile + set nobinary + endfunc + + func Test_terminal_api_drop_newwin_ff() + CheckRunVimInTerminal + let buf = Api_drop_common(',{"ff":"dos"}') + call assert_equal("dos", &ff) + + call StopVimInTerminal(buf) + call delete('Xscript') + bwipe Xtextfile + endfunc + + func Test_terminal_api_drop_newwin_fileformat() + CheckRunVimInTerminal + let buf = Api_drop_common(',{"fileformat":"dos"}') + call assert_equal("dos", &ff) + + call StopVimInTerminal(buf) + call delete('Xscript') + bwipe Xtextfile + endfunc + + func Test_terminal_api_drop_newwin_enc() + CheckRunVimInTerminal + let buf = Api_drop_common(',{"enc":"utf-16"}') + call assert_equal("utf-16", &fenc) + + call StopVimInTerminal(buf) + call delete('Xscript') + bwipe Xtextfile + endfunc + + func Test_terminal_api_drop_newwin_encoding() + CheckRunVimInTerminal + let buf = Api_drop_common(',{"encoding":"utf-16"}') + call assert_equal("utf-16", &fenc) + + call StopVimInTerminal(buf) + call delete('Xscript') + bwipe Xtextfile + endfunc + + func Test_terminal_api_drop_oldwin() + CheckRunVimInTerminal + let firstwinid = win_getid() + split Xtextfile + let textfile_winid = win_getid() + call assert_equal(2, winnr('$')) + call win_gotoid(firstwinid) + + " Use the title termcap entries to output the escape sequence. + call writefile([ + \ 'set title', + \ 'exe "set t_ts=\]51; t_fs=\x07"', + \ 'let &titlestring = ''["drop","Xtextfile"]''', + \ 'redraw', + \ "set t_ts=", + \ ], 'Xscript') + let buf = RunVimInTerminal('-S Xscript', {'rows': 10}) + call WaitForAssert({-> assert_equal('Xtextfile', expand('%:t'))}) + call assert_equal(textfile_winid, win_getid()) + + call StopVimInTerminal(buf) + call delete('Xscript') + bwipe Xtextfile + endfunc + + func Tapi_TryThis(bufnum, arg) + let g:called_bufnum = a:bufnum + let g:called_arg = a:arg + endfunc + + func WriteApiCall(funcname) + " Use the title termcap entries to output the escape sequence. + call writefile([ + \ 'set title', + \ 'exe "set t_ts=\]51; t_fs=\x07"', + \ 'let &titlestring = ''["call","' . a:funcname . '",["hello",123]]''', + \ 'redraw', + \ "set t_ts=", + \ ], 'Xscript') + endfunc + + func Test_terminal_api_call() + CheckRunVimInTerminal + + unlet! g:called_bufnum + unlet! g:called_arg + + call WriteApiCall('Tapi_TryThis') + + " Default + let buf = RunVimInTerminal('-S Xscript', {}) + call WaitFor({-> exists('g:called_bufnum')}) + call assert_equal(buf, g:called_bufnum) + call assert_equal(['hello', 123], g:called_arg) + call StopVimInTerminal(buf) + + unlet! g:called_bufnum + unlet! g:called_arg + + " Enable explicitly + let buf = RunVimInTerminal('-S Xscript', {'term_api': 'Tapi_Try'}) + call WaitFor({-> exists('g:called_bufnum')}) + call assert_equal(buf, g:called_bufnum) + call assert_equal(['hello', 123], g:called_arg) + call StopVimInTerminal(buf) + + unlet! g:called_bufnum + unlet! g:called_arg + + func! ApiCall_TryThis(bufnum, arg) + let g:called_bufnum2 = a:bufnum + let g:called_arg2 = a:arg + endfunc + + call WriteApiCall('ApiCall_TryThis') + + " Use prefix match + let buf = RunVimInTerminal('-S Xscript', {'term_api': 'ApiCall_'}) + call WaitFor({-> exists('g:called_bufnum2')}) + call assert_equal(buf, g:called_bufnum2) + call assert_equal(['hello', 123], g:called_arg2) + call StopVimInTerminal(buf) + + call assert_fails("call term_start('ls', {'term_api' : []})", 'E475:') + + unlet! g:called_bufnum2 + unlet! g:called_arg2 + + call delete('Xscript') + delfunction! ApiCall_TryThis + unlet! g:called_bufnum2 + unlet! g:called_arg2 + endfunc + + func Test_terminal_api_call_fails() + CheckRunVimInTerminal + + func! TryThis(bufnum, arg) + let g:called_bufnum3 = a:bufnum + let g:called_arg3 = a:arg + endfunc + + call WriteApiCall('TryThis') + + unlet! g:called_bufnum3 + unlet! g:called_arg3 + + " Not permitted + call ch_logfile('Xlog', 'w') + let buf = RunVimInTerminal('-S Xscript', {'term_api': ''}) + call WaitForAssert({-> assert_match('Unpermitted function: TryThis', string(readfile('Xlog')))}) + call assert_false(exists('g:called_bufnum3')) + call assert_false(exists('g:called_arg3')) + call StopVimInTerminal(buf) + + " No match + call ch_logfile('Xlog', 'w') + let buf = RunVimInTerminal('-S Xscript', {'term_api': 'TryThat'}) + call WaitFor({-> string(readfile('Xlog')) =~ 'Unpermitted function: TryThis'}) + call assert_false(exists('g:called_bufnum3')) + call assert_false(exists('g:called_arg3')) + call StopVimInTerminal(buf) + + call delete('Xscript') + call ch_logfile('') + call delete('Xlog') + delfunction! TryThis + unlet! g:called_bufnum3 + unlet! g:called_arg3 + endfunc + + let s:caught_e937 = 0 + + func Tapi_Delete(bufnum, arg) + try + execute 'bdelete!' a:bufnum + catch /E937:/ + let s:caught_e937 = 1 + endtry + endfunc + + func Test_terminal_api_call_fail_delete() + CheckRunVimInTerminal + + call WriteApiCall('Tapi_Delete') + let buf = RunVimInTerminal('-S Xscript', {}) + call WaitForAssert({-> assert_equal(1, s:caught_e937)}) + + call StopVimInTerminal(buf) + call delete('Xscript') + call ch_logfile('', '') + endfunc + + func Test_terminal_setapi_and_call() + CheckRunVimInTerminal + + call WriteApiCall('Tapi_TryThis') + call ch_logfile('Xlog', 'w') + + unlet! g:called_bufnum + unlet! g:called_arg + + let buf = RunVimInTerminal('-S Xscript', {'term_api': ''}) + call WaitForAssert({-> assert_match('Unpermitted function: Tapi_TryThis', string(readfile('Xlog')))}) + call assert_false(exists('g:called_bufnum')) + call assert_false(exists('g:called_arg')) + + eval buf->term_setapi('Tapi_') + call term_sendkeys(buf, ":set notitle\") + call term_sendkeys(buf, ":source Xscript\") + call WaitFor({-> exists('g:called_bufnum')}) + call assert_equal(buf, g:called_bufnum) + call assert_equal(['hello', 123], g:called_arg) + + call StopVimInTerminal(buf) + + call delete('Xscript') + call ch_logfile('') + call delete('Xlog') + unlet! g:called_bufnum + unlet! g:called_arg + endfunc + + func Test_terminal_api_arg() + CheckRunVimInTerminal + + call WriteApiCall('Tapi_TryThis') + call ch_logfile('Xlog', 'w') + + unlet! g:called_bufnum + unlet! g:called_arg + + execute 'term ++api= ' .. GetVimCommandCleanTerm() .. '-S Xscript' + let buf = bufnr('%') + call WaitForAssert({-> assert_match('Unpermitted function: Tapi_TryThis', string(readfile('Xlog')))}) + call assert_false(exists('g:called_bufnum')) + call assert_false(exists('g:called_arg')) + + call StopVimInTerminal(buf) + + call ch_logfile('Xlog', 'w') + + execute 'term ++api=Tapi_ ' .. GetVimCommandCleanTerm() .. '-S Xscript' + let buf = bufnr('%') + call WaitFor({-> exists('g:called_bufnum')}) + call assert_equal(buf, g:called_bufnum) + call assert_equal(['hello', 123], g:called_arg) + + call StopVimInTerminal(buf) + + call delete('Xscript') + call ch_logfile('') + call delete('Xlog') + unlet! g:called_bufnum + unlet! g:called_arg + endfunc + + func Test_terminal_ansicolors_default() + CheckFunction term_getansicolors + + let colors = [ + \ '#000000', '#e00000', + \ '#00e000', '#e0e000', + \ '#0000e0', '#e000e0', + \ '#00e0e0', '#e0e0e0', + \ '#808080', '#ff4040', + \ '#40ff40', '#ffff40', + \ '#4040ff', '#ff40ff', + \ '#40ffff', '#ffffff', + \] + + let buf = Run_shell_in_terminal({}) + call assert_equal(colors, term_getansicolors(buf)) + call StopShellInTerminal(buf) + call TermWait(buf) + call assert_equal([], term_getansicolors(buf)) + + exe buf . 'bwipe' + endfunc + + let s:test_colors = [ + \ '#616e64', '#0d0a79', + \ '#6d610d', '#0a7373', + \ '#690d0a', '#6d696e', + \ '#0d0a6f', '#616e0d', + \ '#0a6479', '#6d0d0a', + \ '#617373', '#0d0a69', + \ '#6d690d', '#0a6e6f', + \ '#610d0a', '#6e6479', + \] + + func Test_terminal_ansicolors_global() + CheckFeature termguicolors + CheckFunction term_getansicolors + + let g:terminal_ansi_colors = reverse(copy(s:test_colors)) + let buf = Run_shell_in_terminal({}) + call assert_equal(g:terminal_ansi_colors, term_getansicolors(buf)) + call StopShellInTerminal(buf) + call TermWait(buf) + + exe buf . 'bwipe' + unlet g:terminal_ansi_colors + endfunc + + func Test_terminal_ansicolors_func() + CheckFeature termguicolors + CheckFunction term_getansicolors + + let g:terminal_ansi_colors = reverse(copy(s:test_colors)) + let buf = Run_shell_in_terminal({'ansi_colors': s:test_colors}) + call assert_equal(s:test_colors, term_getansicolors(buf)) + + call term_setansicolors(buf, g:terminal_ansi_colors) + call assert_equal(g:terminal_ansi_colors, buf->term_getansicolors()) + + let colors = [ + \ 'ivory', 'AliceBlue', + \ 'grey67', 'dark goldenrod', + \ 'SteelBlue3', 'PaleVioletRed4', + \ 'MediumPurple2', 'yellow2', + \ 'RosyBrown3', 'OrangeRed2', + \ 'white smoke', 'navy blue', + \ 'grey47', 'gray97', + \ 'MistyRose2', 'DodgerBlue4', + \] + eval buf->term_setansicolors(colors) + + let colors[4] = 'Invalid' + call assert_fails('call term_setansicolors(buf, colors)', 'E474:') + call assert_fails('call term_setansicolors(buf, {})', 'E714:') + + call StopShellInTerminal(buf) + call TermWait(buf) + call assert_equal(0, term_setansicolors(buf, [])) + exe buf . 'bwipe' + endfunc + + func Test_terminal_all_ansi_colors() + CheckRunVimInTerminal + + " Use all the ANSI colors. + call writefile([ + \ 'call setline(1, "AABBCCDDEEFFGGHHIIJJKKLLMMNNOOPP XXYYZZ")', + \ 'hi Tblack ctermfg=0 ctermbg=8', + \ 'hi Tdarkred ctermfg=1 ctermbg=9', + \ 'hi Tdarkgreen ctermfg=2 ctermbg=10', + \ 'hi Tbrown ctermfg=3 ctermbg=11', + \ 'hi Tdarkblue ctermfg=4 ctermbg=12', + \ 'hi Tdarkmagenta ctermfg=5 ctermbg=13', + \ 'hi Tdarkcyan ctermfg=6 ctermbg=14', + \ 'hi Tlightgrey ctermfg=7 ctermbg=15', + \ 'hi Tdarkgrey ctermfg=8 ctermbg=0', + \ 'hi Tred ctermfg=9 ctermbg=1', + \ 'hi Tgreen ctermfg=10 ctermbg=2', + \ 'hi Tyellow ctermfg=11 ctermbg=3', + \ 'hi Tblue ctermfg=12 ctermbg=4', + \ 'hi Tmagenta ctermfg=13 ctermbg=5', + \ 'hi Tcyan ctermfg=14 ctermbg=6', + \ 'hi Twhite ctermfg=15 ctermbg=7', + \ 'hi TdarkredBold ctermfg=1 cterm=bold', + \ 'hi TgreenBold ctermfg=10 cterm=bold', + \ 'hi TmagentaBold ctermfg=13 cterm=bold ctermbg=5', + \ '', + \ 'call matchadd("Tblack", "A")', + \ 'call matchadd("Tdarkred", "B")', + \ 'call matchadd("Tdarkgreen", "C")', + \ 'call matchadd("Tbrown", "D")', + \ 'call matchadd("Tdarkblue", "E")', + \ 'call matchadd("Tdarkmagenta", "F")', + \ 'call matchadd("Tdarkcyan", "G")', + \ 'call matchadd("Tlightgrey", "H")', + \ 'call matchadd("Tdarkgrey", "I")', + \ 'call matchadd("Tred", "J")', + \ 'call matchadd("Tgreen", "K")', + \ 'call matchadd("Tyellow", "L")', + \ 'call matchadd("Tblue", "M")', + \ 'call matchadd("Tmagenta", "N")', + \ 'call matchadd("Tcyan", "O")', + \ 'call matchadd("Twhite", "P")', + \ 'call matchadd("TdarkredBold", "X")', + \ 'call matchadd("TgreenBold", "Y")', + \ 'call matchadd("TmagentaBold", "Z")', + \ 'redraw', + \ ], 'Xcolorscript') + let buf = RunVimInTerminal('-S Xcolorscript', {'rows': 10}) + call VerifyScreenDump(buf, 'Test_terminal_all_ansi_colors', {}) + + call term_sendkeys(buf, ":q\") + call StopVimInTerminal(buf) + call delete('Xcolorscript') + endfunc + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1176/src/testdir/test_terminal2.vim 2020-07-01 21:53:33.411476027 +0200 --- src/testdir/test_terminal2.vim 2020-07-11 13:07:54.566181190 +0200 *************** *** 1,6 **** " Tests for the terminal window. " This is split in two, because it can take a lot of time. ! " See test_terminal2.vim for further tests. source check.vim CheckFeature terminal --- 1,6 ---- " Tests for the terminal window. " This is split in two, because it can take a lot of time. ! " See test_terminal.vim and test_terminal3.vim for further tests. source check.vim CheckFeature terminal *************** *** 10,420 **** source mouse.vim source term_util.vim - let s:python = PythonProg() let $PROMPT_COMMAND='' - func Api_drop_common(options) - call assert_equal(1, winnr('$')) - - " Use the title termcap entries to output the escape sequence. - call writefile([ - \ 'set title', - \ 'exe "set t_ts=\]51; t_fs=\x07"', - \ 'let &titlestring = ''["drop","Xtextfile"' . a:options . ']''', - \ 'redraw', - \ "set t_ts=", - \ ], 'Xscript') - let buf = RunVimInTerminal('-S Xscript', {}) - call WaitFor({-> bufnr('Xtextfile') > 0}) - call assert_equal('Xtextfile', expand('%:t')) - call assert_true(winnr('$') >= 3) - return buf - endfunc - - func Test_terminal_api_drop_newwin() - CheckRunVimInTerminal - let buf = Api_drop_common('') - call assert_equal(0, &bin) - call assert_equal('', &fenc) - - call StopVimInTerminal(buf) - call delete('Xscript') - bwipe Xtextfile - endfunc - - func Test_terminal_api_drop_newwin_bin() - CheckRunVimInTerminal - let buf = Api_drop_common(',{"bin":1}') - call assert_equal(1, &bin) - - call StopVimInTerminal(buf) - call delete('Xscript') - bwipe Xtextfile - endfunc - - func Test_terminal_api_drop_newwin_binary() - CheckRunVimInTerminal - let buf = Api_drop_common(',{"binary":1}') - call assert_equal(1, &bin) - - call StopVimInTerminal(buf) - call delete('Xscript') - bwipe Xtextfile - endfunc - - func Test_terminal_api_drop_newwin_nobin() - CheckRunVimInTerminal - set binary - let buf = Api_drop_common(',{"nobin":1}') - call assert_equal(0, &bin) - - call StopVimInTerminal(buf) - call delete('Xscript') - bwipe Xtextfile - set nobinary - endfunc - - func Test_terminal_api_drop_newwin_nobinary() - CheckRunVimInTerminal - set binary - let buf = Api_drop_common(',{"nobinary":1}') - call assert_equal(0, &bin) - - call StopVimInTerminal(buf) - call delete('Xscript') - bwipe Xtextfile - set nobinary - endfunc - - func Test_terminal_api_drop_newwin_ff() - CheckRunVimInTerminal - let buf = Api_drop_common(',{"ff":"dos"}') - call assert_equal("dos", &ff) - - call StopVimInTerminal(buf) - call delete('Xscript') - bwipe Xtextfile - endfunc - - func Test_terminal_api_drop_newwin_fileformat() - CheckRunVimInTerminal - let buf = Api_drop_common(',{"fileformat":"dos"}') - call assert_equal("dos", &ff) - - call StopVimInTerminal(buf) - call delete('Xscript') - bwipe Xtextfile - endfunc - - func Test_terminal_api_drop_newwin_enc() - CheckRunVimInTerminal - let buf = Api_drop_common(',{"enc":"utf-16"}') - call assert_equal("utf-16", &fenc) - - call StopVimInTerminal(buf) - call delete('Xscript') - bwipe Xtextfile - endfunc - - func Test_terminal_api_drop_newwin_encoding() - CheckRunVimInTerminal - let buf = Api_drop_common(',{"encoding":"utf-16"}') - call assert_equal("utf-16", &fenc) - - call StopVimInTerminal(buf) - call delete('Xscript') - bwipe Xtextfile - endfunc - - func Test_terminal_api_drop_oldwin() - CheckRunVimInTerminal - let firstwinid = win_getid() - split Xtextfile - let textfile_winid = win_getid() - call assert_equal(2, winnr('$')) - call win_gotoid(firstwinid) - - " Use the title termcap entries to output the escape sequence. - call writefile([ - \ 'set title', - \ 'exe "set t_ts=\]51; t_fs=\x07"', - \ 'let &titlestring = ''["drop","Xtextfile"]''', - \ 'redraw', - \ "set t_ts=", - \ ], 'Xscript') - let buf = RunVimInTerminal('-S Xscript', {'rows': 10}) - call WaitForAssert({-> assert_equal('Xtextfile', expand('%:t'))}) - call assert_equal(textfile_winid, win_getid()) - - call StopVimInTerminal(buf) - call delete('Xscript') - bwipe Xtextfile - endfunc - - func Tapi_TryThis(bufnum, arg) - let g:called_bufnum = a:bufnum - let g:called_arg = a:arg - endfunc - - func WriteApiCall(funcname) - " Use the title termcap entries to output the escape sequence. - call writefile([ - \ 'set title', - \ 'exe "set t_ts=\]51; t_fs=\x07"', - \ 'let &titlestring = ''["call","' . a:funcname . '",["hello",123]]''', - \ 'redraw', - \ "set t_ts=", - \ ], 'Xscript') - endfunc - - func Test_terminal_api_call() - CheckRunVimInTerminal - - unlet! g:called_bufnum - unlet! g:called_arg - - call WriteApiCall('Tapi_TryThis') - - " Default - let buf = RunVimInTerminal('-S Xscript', {}) - call WaitFor({-> exists('g:called_bufnum')}) - call assert_equal(buf, g:called_bufnum) - call assert_equal(['hello', 123], g:called_arg) - call StopVimInTerminal(buf) - - unlet! g:called_bufnum - unlet! g:called_arg - - " Enable explicitly - let buf = RunVimInTerminal('-S Xscript', {'term_api': 'Tapi_Try'}) - call WaitFor({-> exists('g:called_bufnum')}) - call assert_equal(buf, g:called_bufnum) - call assert_equal(['hello', 123], g:called_arg) - call StopVimInTerminal(buf) - - unlet! g:called_bufnum - unlet! g:called_arg - - func! ApiCall_TryThis(bufnum, arg) - let g:called_bufnum2 = a:bufnum - let g:called_arg2 = a:arg - endfunc - - call WriteApiCall('ApiCall_TryThis') - - " Use prefix match - let buf = RunVimInTerminal('-S Xscript', {'term_api': 'ApiCall_'}) - call WaitFor({-> exists('g:called_bufnum2')}) - call assert_equal(buf, g:called_bufnum2) - call assert_equal(['hello', 123], g:called_arg2) - call StopVimInTerminal(buf) - - call assert_fails("call term_start('ls', {'term_api' : []})", 'E475:') - - unlet! g:called_bufnum2 - unlet! g:called_arg2 - - call delete('Xscript') - delfunction! ApiCall_TryThis - unlet! g:called_bufnum2 - unlet! g:called_arg2 - endfunc - - func Test_terminal_api_call_fails() - CheckRunVimInTerminal - - func! TryThis(bufnum, arg) - let g:called_bufnum3 = a:bufnum - let g:called_arg3 = a:arg - endfunc - - call WriteApiCall('TryThis') - - unlet! g:called_bufnum3 - unlet! g:called_arg3 - - " Not permitted - call ch_logfile('Xlog', 'w') - let buf = RunVimInTerminal('-S Xscript', {'term_api': ''}) - call WaitForAssert({-> assert_match('Unpermitted function: TryThis', string(readfile('Xlog')))}) - call assert_false(exists('g:called_bufnum3')) - call assert_false(exists('g:called_arg3')) - call StopVimInTerminal(buf) - - " No match - call ch_logfile('Xlog', 'w') - let buf = RunVimInTerminal('-S Xscript', {'term_api': 'TryThat'}) - call WaitFor({-> string(readfile('Xlog')) =~ 'Unpermitted function: TryThis'}) - call assert_false(exists('g:called_bufnum3')) - call assert_false(exists('g:called_arg3')) - call StopVimInTerminal(buf) - - call delete('Xscript') - call ch_logfile('') - call delete('Xlog') - delfunction! TryThis - unlet! g:called_bufnum3 - unlet! g:called_arg3 - endfunc - - let s:caught_e937 = 0 - - func Tapi_Delete(bufnum, arg) - try - execute 'bdelete!' a:bufnum - catch /E937:/ - let s:caught_e937 = 1 - endtry - endfunc - - func Test_terminal_api_call_fail_delete() - CheckRunVimInTerminal - - call WriteApiCall('Tapi_Delete') - let buf = RunVimInTerminal('-S Xscript', {}) - call WaitForAssert({-> assert_equal(1, s:caught_e937)}) - - call StopVimInTerminal(buf) - call delete('Xscript') - call ch_logfile('', '') - endfunc - - func Test_terminal_ansicolors_default() - CheckFunction term_getansicolors - - let colors = [ - \ '#000000', '#e00000', - \ '#00e000', '#e0e000', - \ '#0000e0', '#e000e0', - \ '#00e0e0', '#e0e0e0', - \ '#808080', '#ff4040', - \ '#40ff40', '#ffff40', - \ '#4040ff', '#ff40ff', - \ '#40ffff', '#ffffff', - \] - - let buf = Run_shell_in_terminal({}) - call assert_equal(colors, term_getansicolors(buf)) - call StopShellInTerminal(buf) - call TermWait(buf) - call assert_equal([], term_getansicolors(buf)) - - exe buf . 'bwipe' - endfunc - - let s:test_colors = [ - \ '#616e64', '#0d0a79', - \ '#6d610d', '#0a7373', - \ '#690d0a', '#6d696e', - \ '#0d0a6f', '#616e0d', - \ '#0a6479', '#6d0d0a', - \ '#617373', '#0d0a69', - \ '#6d690d', '#0a6e6f', - \ '#610d0a', '#6e6479', - \] - - func Test_terminal_ansicolors_global() - CheckFeature termguicolors - CheckFunction term_getansicolors - - let g:terminal_ansi_colors = reverse(copy(s:test_colors)) - let buf = Run_shell_in_terminal({}) - call assert_equal(g:terminal_ansi_colors, term_getansicolors(buf)) - call StopShellInTerminal(buf) - call TermWait(buf) - - exe buf . 'bwipe' - unlet g:terminal_ansi_colors - endfunc - - func Test_terminal_ansicolors_func() - CheckFeature termguicolors - CheckFunction term_getansicolors - - let g:terminal_ansi_colors = reverse(copy(s:test_colors)) - let buf = Run_shell_in_terminal({'ansi_colors': s:test_colors}) - call assert_equal(s:test_colors, term_getansicolors(buf)) - - call term_setansicolors(buf, g:terminal_ansi_colors) - call assert_equal(g:terminal_ansi_colors, buf->term_getansicolors()) - - let colors = [ - \ 'ivory', 'AliceBlue', - \ 'grey67', 'dark goldenrod', - \ 'SteelBlue3', 'PaleVioletRed4', - \ 'MediumPurple2', 'yellow2', - \ 'RosyBrown3', 'OrangeRed2', - \ 'white smoke', 'navy blue', - \ 'grey47', 'gray97', - \ 'MistyRose2', 'DodgerBlue4', - \] - eval buf->term_setansicolors(colors) - - let colors[4] = 'Invalid' - call assert_fails('call term_setansicolors(buf, colors)', 'E474:') - call assert_fails('call term_setansicolors(buf, {})', 'E714:') - - call StopShellInTerminal(buf) - call TermWait(buf) - call assert_equal(0, term_setansicolors(buf, [])) - exe buf . 'bwipe' - endfunc - - func Test_terminal_all_ansi_colors() - CheckRunVimInTerminal - - " Use all the ANSI colors. - call writefile([ - \ 'call setline(1, "AABBCCDDEEFFGGHHIIJJKKLLMMNNOOPP XXYYZZ")', - \ 'hi Tblack ctermfg=0 ctermbg=8', - \ 'hi Tdarkred ctermfg=1 ctermbg=9', - \ 'hi Tdarkgreen ctermfg=2 ctermbg=10', - \ 'hi Tbrown ctermfg=3 ctermbg=11', - \ 'hi Tdarkblue ctermfg=4 ctermbg=12', - \ 'hi Tdarkmagenta ctermfg=5 ctermbg=13', - \ 'hi Tdarkcyan ctermfg=6 ctermbg=14', - \ 'hi Tlightgrey ctermfg=7 ctermbg=15', - \ 'hi Tdarkgrey ctermfg=8 ctermbg=0', - \ 'hi Tred ctermfg=9 ctermbg=1', - \ 'hi Tgreen ctermfg=10 ctermbg=2', - \ 'hi Tyellow ctermfg=11 ctermbg=3', - \ 'hi Tblue ctermfg=12 ctermbg=4', - \ 'hi Tmagenta ctermfg=13 ctermbg=5', - \ 'hi Tcyan ctermfg=14 ctermbg=6', - \ 'hi Twhite ctermfg=15 ctermbg=7', - \ 'hi TdarkredBold ctermfg=1 cterm=bold', - \ 'hi TgreenBold ctermfg=10 cterm=bold', - \ 'hi TmagentaBold ctermfg=13 cterm=bold ctermbg=5', - \ '', - \ 'call matchadd("Tblack", "A")', - \ 'call matchadd("Tdarkred", "B")', - \ 'call matchadd("Tdarkgreen", "C")', - \ 'call matchadd("Tbrown", "D")', - \ 'call matchadd("Tdarkblue", "E")', - \ 'call matchadd("Tdarkmagenta", "F")', - \ 'call matchadd("Tdarkcyan", "G")', - \ 'call matchadd("Tlightgrey", "H")', - \ 'call matchadd("Tdarkgrey", "I")', - \ 'call matchadd("Tred", "J")', - \ 'call matchadd("Tgreen", "K")', - \ 'call matchadd("Tyellow", "L")', - \ 'call matchadd("Tblue", "M")', - \ 'call matchadd("Tmagenta", "N")', - \ 'call matchadd("Tcyan", "O")', - \ 'call matchadd("Twhite", "P")', - \ 'call matchadd("TdarkredBold", "X")', - \ 'call matchadd("TgreenBold", "Y")', - \ 'call matchadd("TmagentaBold", "Z")', - \ 'redraw', - \ ], 'Xcolorscript') - let buf = RunVimInTerminal('-S Xcolorscript', {'rows': 10}) - call VerifyScreenDump(buf, 'Test_terminal_all_ansi_colors', {}) - - call term_sendkeys(buf, ":q\") - call StopVimInTerminal(buf) - call delete('Xcolorscript') - endfunc - func Test_terminal_termwinsize_option_fixed() CheckRunVimInTerminal set termwinsize=6x40 --- 10,17 ---- *************** *** 975,1550 **** only! endfunc - func Test_terminal_altscreen() - " somehow doesn't work on MS-Windows - CheckUnix - let cmd = "cat Xtext\" - - let buf = term_start(&shell, {}) - call writefile(["\[?1047h"], 'Xtext') - call term_sendkeys(buf, cmd) - call WaitForAssert({-> assert_equal(1, term_getaltscreen(buf))}) - - call writefile(["\[?1047l"], 'Xtext') - call term_sendkeys(buf, cmd) - call WaitForAssert({-> assert_equal(0, term_getaltscreen(buf))}) - - call term_sendkeys(buf, "exit\r") - exe buf . "bwipe!" - call delete('Xtext') - endfunc - - func Test_terminal_shell_option() - if has('unix') - " exec is a shell builtin command, should fail without a shell. - term exec ls runtest.vim - call WaitForAssert({-> assert_match('job failed', term_getline(bufnr(), 1))}) - bwipe! - - term ++shell exec ls runtest.vim - call WaitForAssert({-> assert_match('runtest.vim', term_getline(bufnr(), 1))}) - bwipe! - elseif has('win32') - " dir is a shell builtin command, should fail without a shell. - try - term dir /b runtest.vim - call WaitForAssert({-> assert_match('job failed\|cannot access .*: No such file or directory', term_getline(bufnr(), 1))}) - catch /CreateProcess/ - " ignore - endtry - bwipe! - - term ++shell dir /b runtest.vim - call WaitForAssert({-> assert_match('runtest.vim', term_getline(bufnr(), 1))}) - bwipe! - endif - endfunc - - func Test_terminal_setapi_and_call() - CheckRunVimInTerminal - - call WriteApiCall('Tapi_TryThis') - call ch_logfile('Xlog', 'w') - - unlet! g:called_bufnum - unlet! g:called_arg - - let buf = RunVimInTerminal('-S Xscript', {'term_api': ''}) - call WaitForAssert({-> assert_match('Unpermitted function: Tapi_TryThis', string(readfile('Xlog')))}) - call assert_false(exists('g:called_bufnum')) - call assert_false(exists('g:called_arg')) - - eval buf->term_setapi('Tapi_') - call term_sendkeys(buf, ":set notitle\") - call term_sendkeys(buf, ":source Xscript\") - call WaitFor({-> exists('g:called_bufnum')}) - call assert_equal(buf, g:called_bufnum) - call assert_equal(['hello', 123], g:called_arg) - - call StopVimInTerminal(buf) - - call delete('Xscript') - call ch_logfile('') - call delete('Xlog') - unlet! g:called_bufnum - unlet! g:called_arg - endfunc - - func Test_terminal_api_arg() - CheckRunVimInTerminal - - call WriteApiCall('Tapi_TryThis') - call ch_logfile('Xlog', 'w') - - unlet! g:called_bufnum - unlet! g:called_arg - - execute 'term ++api= ' .. GetVimCommandCleanTerm() .. '-S Xscript' - let buf = bufnr('%') - call WaitForAssert({-> assert_match('Unpermitted function: Tapi_TryThis', string(readfile('Xlog')))}) - call assert_false(exists('g:called_bufnum')) - call assert_false(exists('g:called_arg')) - - call StopVimInTerminal(buf) - - call ch_logfile('Xlog', 'w') - - execute 'term ++api=Tapi_ ' .. GetVimCommandCleanTerm() .. '-S Xscript' - let buf = bufnr('%') - call WaitFor({-> exists('g:called_bufnum')}) - call assert_equal(buf, g:called_bufnum) - call assert_equal(['hello', 123], g:called_arg) - - call StopVimInTerminal(buf) - - call delete('Xscript') - call ch_logfile('') - call delete('Xlog') - unlet! g:called_bufnum - unlet! g:called_arg - endfunc - - func Test_terminal_invalid_arg() - call assert_fails('terminal ++xyz', 'E181:') - endfunc - - func Test_terminal_in_popup() - CheckRunVimInTerminal - - let text =<< trim END - some text - to edit - in a popup window - END - call writefile(text, 'Xtext') - let cmd = GetVimCommandCleanTerm() - let lines = [ - \ 'call setline(1, range(20))', - \ 'hi PopTerm ctermbg=grey', - \ 'func OpenTerm(setColor)', - \ " set noruler", - \ " let s:buf = term_start('" .. cmd .. " Xtext', #{hidden: 1, term_finish: 'close'})", - \ ' let g:winid = popup_create(s:buf, #{minwidth: 45, minheight: 7, border: [], drag: 1, resize: 1})', - \ ' if a:setColor', - \ ' call win_execute(g:winid, "set wincolor=PopTerm")', - \ ' endif', - \ 'endfunc', - \ 'func HidePopup()', - \ ' call popup_hide(g:winid)', - \ 'endfunc', - \ 'func ClosePopup()', - \ ' call popup_close(g:winid)', - \ 'endfunc', - \ 'func ReopenPopup()', - \ ' call popup_create(s:buf, #{minwidth: 40, minheight: 6, border: []})', - \ 'endfunc', - \ ] - call writefile(lines, 'XtermPopup') - let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15}) - call TermWait(buf, 100) - call term_sendkeys(buf, ":call OpenTerm(0)\") - call TermWait(buf, 100) - call term_sendkeys(buf, ":\") - call TermWait(buf, 100) - call term_sendkeys(buf, "\:echo getwinvar(g:winid, \"&buftype\") win_gettype(g:winid)\") - call VerifyScreenDump(buf, 'Test_terminal_popup_1', {}) - - call term_sendkeys(buf, ":q\") - call VerifyScreenDump(buf, 'Test_terminal_popup_2', {}) - - call term_sendkeys(buf, ":call OpenTerm(1)\") - call TermWait(buf, 150) - call term_sendkeys(buf, ":set hlsearch\") - call TermWait(buf, 100) - call term_sendkeys(buf, "/edit\") - call VerifyScreenDump(buf, 'Test_terminal_popup_3', {}) - - call term_sendkeys(buf, "\:call HidePopup()\") - call VerifyScreenDump(buf, 'Test_terminal_popup_4', {}) - call term_sendkeys(buf, "\") - call TermWait(buf, 50) - - call term_sendkeys(buf, "\:call ClosePopup()\") - call VerifyScreenDump(buf, 'Test_terminal_popup_5', {}) - - call term_sendkeys(buf, "\:call ReopenPopup()\") - call VerifyScreenDump(buf, 'Test_terminal_popup_6', {}) - - " Go to terminal-Normal mode and visually select text. - call term_sendkeys(buf, "\Ngg/in\vww") - call VerifyScreenDump(buf, 'Test_terminal_popup_7', {}) - - " Back to job mode, redraws - call term_sendkeys(buf, "A") - call VerifyScreenDump(buf, 'Test_terminal_popup_8', {}) - - call TermWait(buf, 50) - call term_sendkeys(buf, ":q\") - call TermWait(buf, 150) " wait for terminal to vanish - - call StopVimInTerminal(buf) - call delete('Xtext') - call delete('XtermPopup') - endfunc - - " Check a terminal in popup window uses the default mininum size. - func Test_terminal_in_popup_min_size() - CheckRunVimInTerminal - - let text =<< trim END - another text - to show - in a popup window - END - call writefile(text, 'Xtext') - let lines = [ - \ 'call setline(1, range(20))', - \ 'func OpenTerm()', - \ " let s:buf = term_start('cat Xtext', #{hidden: 1})", - \ ' let g:winid = popup_create(s:buf, #{ border: []})', - \ 'endfunc', - \ ] - call writefile(lines, 'XtermPopup') - let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15}) - call TermWait(buf, 100) - call term_sendkeys(buf, ":set noruler\") - call term_sendkeys(buf, ":call OpenTerm()\") - call TermWait(buf, 50) - call term_sendkeys(buf, ":\") - call VerifyScreenDump(buf, 'Test_terminal_popup_m1', {}) - - call TermWait(buf, 50) - call term_sendkeys(buf, ":q\") - call TermWait(buf, 50) " wait for terminal to vanish - call StopVimInTerminal(buf) - call delete('Xtext') - call delete('XtermPopup') - endfunc - - " Check a terminal in popup window with different colors - func Terminal_in_popup_colored(group_name, highlight_cmd, highlight_opt) - CheckRunVimInTerminal - CheckUnix - - let lines = [ - \ 'call setline(1, range(20))', - \ 'func OpenTerm()', - \ " let s:buf = term_start('cat', #{hidden: 1, " - \ .. a:highlight_opt .. "})", - \ ' let g:winid = popup_create(s:buf, #{ border: []})', - \ 'endfunc', - \ a:highlight_cmd, - \ ] - call writefile(lines, 'XtermPopup') - let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15}) - call TermWait(buf, 100) - call term_sendkeys(buf, ":set noruler\") - call term_sendkeys(buf, ":call OpenTerm()\") - call TermWait(buf, 50) - call term_sendkeys(buf, "hello\") - call VerifyScreenDump(buf, 'Test_terminal_popup_' .. a:group_name, {}) - - call term_sendkeys(buf, "\") - call TermWait(buf, 50) - call term_sendkeys(buf, ":q\") - call TermWait(buf, 50) " wait for terminal to vanish - call StopVimInTerminal(buf) - call delete('XtermPopup') - endfunc - - func Test_terminal_in_popup_colored_Terminal() - call Terminal_in_popup_colored("Terminal", "highlight Terminal ctermfg=blue ctermbg=yellow", "") - endfunc - - func Test_terminal_in_popup_colored_group() - call Terminal_in_popup_colored("MyTermCol", "highlight MyTermCol ctermfg=darkgreen ctermbg=lightblue", "term_highlight: 'MyTermCol',") - endfunc - - func Test_double_popup_terminal() - let buf1 = term_start(&shell, #{hidden: 1}) - let win1 = popup_create(buf1, {}) - let buf2 = term_start(&shell, #{hidden: 1}) - call assert_fails('call popup_create(buf2, {})', 'E861:') - call popup_close(win1) - exe buf1 .. 'bwipe!' - exe buf2 .. 'bwipe!' - endfunc - - func Test_issue_5607() - let wincount = winnr('$') - exe 'terminal' &shell &shellcmdflag 'exit' - let job = term_getjob(bufnr()) - call WaitForAssert({-> assert_equal("dead", job_status(job))}) - - let old_wincolor = &wincolor - try - set wincolor= - finally - let &wincolor = old_wincolor - bw! - endtry - endfunc - - func Test_hidden_terminal() - let buf = term_start(&shell, #{hidden: 1}) - call assert_equal('', bufname('^$')) - call StopShellInTerminal(buf) - endfunc - - func Test_term_nasty_callback() - CheckExecutable sh - - set hidden - let g:buf0 = term_start('sh', #{hidden: 1, term_finish: 'close'}) - call popup_create(g:buf0, {}) - call assert_fails("call term_start(['sh', '-c'], #{curwin: 1})", 'E863:') - - call popup_clear(1) - set hidden& - endfunc - - func Test_term_and_startinsert() - CheckRunVimInTerminal - CheckUnix - - let lines =<< trim EOL - put='some text' - term - startinsert - EOL - call writefile(lines, 'XTest_startinsert') - let buf = RunVimInTerminal('-S XTest_startinsert', {}) - - call term_sendkeys(buf, "exit\r") - call WaitForAssert({-> assert_equal("some text", term_getline(buf, 1))}) - call term_sendkeys(buf, "0l") - call term_sendkeys(buf, "A<\") - call WaitForAssert({-> assert_equal("some text<", term_getline(buf, 1))}) - - call StopVimInTerminal(buf) - call delete('XTest_startinsert') - endfunc - - " Test for passing invalid arguments to terminal functions - func Test_term_func_invalid_arg() - call assert_fails('let b = term_getaltscreen([])', 'E745:') - call assert_fails('let a = term_getattr(1, [])', 'E730:') - call assert_fails('let c = term_getcursor([])', 'E745:') - call assert_fails('let l = term_getline([], 1)', 'E745:') - call assert_fails('let l = term_getscrolled([])', 'E745:') - call assert_fails('let s = term_getsize([])', 'E745:') - call assert_fails('let s = term_getstatus([])', 'E745:') - call assert_fails('let s = term_scrape([], 1)', 'E745:') - call assert_fails('call term_sendkeys([], "a")', 'E745:') - call assert_fails('call term_setapi([], "")', 'E745:') - call assert_fails('call term_setrestore([], "")', 'E745:') - call assert_fails('call term_setkill([], "")', 'E745:') - if has('gui') || has('termguicolors') - call assert_fails('let p = term_getansicolors([])', 'E745:') - call assert_fails('call term_setansicolors([], [])', 'E745:') - endif - endfunc - - " Test for sending various special keycodes to a terminal - func Test_term_keycode_translation() - CheckRunVimInTerminal - - let buf = RunVimInTerminal('', {}) - call term_sendkeys(buf, ":set nocompatible\") - - let keys = ["\", "\", "\", "\", "\", "\", "\", - \ "\", "\", "\", "\", "\", "\", - \ "\", "\", "\", "\", "\", - \ "\", "\", "\", "\", "\", "\", - \ "\", "\", "\", "\", "\", - \ "\"] - let output = ['', '', '', '', '', '', '', - \ '', '', '', '', '', '', '', - \ '', '', '', '', '', '', - \ '', '', '', '', '', - \ '', '', '', '', ''] - - call term_sendkeys(buf, "i") - for i in range(len(keys)) - call term_sendkeys(buf, "\\" .. keys[i]) - call WaitForAssert({-> assert_equal(output[i], term_getline(buf, 1))}) - endfor - - let keypad_keys = ["\", "\", "\", "\", "\", "\", - \ "\", "\", "\", "\", "\", "\", - \ "\", "\", "\"] - let keypad_output = ['0', '1', '2', '3', '4', '5', - \ '6', '7', '8', '9', '.', '+', - \ '-', '*', '/'] - for i in range(len(keypad_keys)) - " TODO: Mysteriously keypad 3 and 9 do not work on some systems. - if keypad_output[i] == '3' || keypad_output[i] == '9' - continue - endif - call term_sendkeys(buf, "\" .. keypad_keys[i]) - call WaitForAssert({-> assert_equal(keypad_output[i], term_getline(buf, 1))}) - endfor - - call feedkeys("\\\one\.two", 'xt') - call WaitForAssert({-> assert_equal('two', term_getline(buf, 1))}) - - call StopVimInTerminal(buf) - endfunc - - " Test for using the mouse in a terminal - func Test_term_mouse() - CheckNotGui - CheckRunVimInTerminal - - let save_mouse = &mouse - let save_term = &term - let save_ttymouse = &ttymouse - let save_clipboard = &clipboard - set mouse=a term=xterm ttymouse=sgr mousetime=200 clipboard= - - let lines =<< trim END - one two three four five - red green yellow red blue - vim emacs sublime nano - END - call writefile(lines, 'Xtest_mouse') - - " Create a terminal window running Vim for the test with mouse enabled - let prev_win = win_getid() - let buf = RunVimInTerminal('Xtest_mouse -n', {}) - call term_sendkeys(buf, ":set nocompatible\") - call term_sendkeys(buf, ":set mouse=a term=xterm ttymouse=sgr\") - call term_sendkeys(buf, ":set clipboard=\") - call term_sendkeys(buf, ":set mousemodel=extend\") - call term_wait(buf) - redraw! - - " Use the mouse to enter the terminal window - call win_gotoid(prev_win) - call feedkeys(MouseLeftClickCode(1, 1), 'x') - call feedkeys(MouseLeftReleaseCode(1, 1), 'x') - call assert_equal(1, getwininfo(win_getid())[0].terminal) - - " Test for click/release - call test_setmouse(2, 5) - call feedkeys("\\", 'xt') - call test_setmouse(3, 8) - call term_sendkeys(buf, "\\") - call term_wait(buf, 50) - call term_sendkeys(buf, ":call writefile([json_encode(getpos('.'))], 'Xbuf')\") - call term_wait(buf, 50) - let pos = json_decode(readfile('Xbuf')[0]) - call assert_equal([3, 8], pos[1:2]) - - " Test for selecting text using mouse - call delete('Xbuf') - call test_setmouse(2, 11) - call term_sendkeys(buf, "\") - call test_setmouse(2, 16) - call term_sendkeys(buf, "\y") - call term_wait(buf, 50) - call term_sendkeys(buf, ":call writefile([@\"], 'Xbuf')\") - call term_wait(buf, 50) - call assert_equal('yellow', readfile('Xbuf')[0]) - - " Test for selecting text using doubleclick - call delete('Xbuf') - call test_setmouse(1, 11) - call term_sendkeys(buf, "\\\") - call test_setmouse(1, 17) - call term_sendkeys(buf, "\y") - call term_wait(buf, 50) - call term_sendkeys(buf, ":call writefile([@\"], 'Xbuf')\") - call term_wait(buf, 50) - call assert_equal('three four', readfile('Xbuf')[0]) - - " Test for selecting a line using triple click - call delete('Xbuf') - call test_setmouse(3, 2) - call term_sendkeys(buf, "\\\\\\y") - call term_wait(buf, 50) - call term_sendkeys(buf, ":call writefile([@\"], 'Xbuf')\") - call term_wait(buf, 50) - call assert_equal("vim emacs sublime nano\n", readfile('Xbuf')[0]) - - " Test for selecting a block using qudraple click - call delete('Xbuf') - call test_setmouse(1, 11) - call term_sendkeys(buf, "\\\\\\\") - call test_setmouse(3, 13) - call term_sendkeys(buf, "\y") - call term_wait(buf, 50) - call term_sendkeys(buf, ":call writefile([@\"], 'Xbuf')\") - call term_wait(buf, 50) - call assert_equal("ree\nyel\nsub", readfile('Xbuf')[0]) - - " Test for extending a selection using right click - call delete('Xbuf') - call test_setmouse(2, 9) - call term_sendkeys(buf, "\\") - call test_setmouse(2, 16) - call term_sendkeys(buf, "\\y") - call term_wait(buf, 50) - call term_sendkeys(buf, ":call writefile([@\"], 'Xbuf')\") - call term_wait(buf, 50) - call assert_equal("n yellow", readfile('Xbuf')[0]) - - " Test for pasting text using middle click - call delete('Xbuf') - call term_sendkeys(buf, ":let @r='bright '\") - call test_setmouse(2, 22) - call term_sendkeys(buf, "\"r\\") - call term_wait(buf, 50) - call term_sendkeys(buf, ":call writefile([getline(2)], 'Xbuf')\") - call term_wait(buf, 50) - call assert_equal("red bright blue", readfile('Xbuf')[0][-15:]) - - " cleanup - call term_wait(buf) - call StopVimInTerminal(buf) - let &mouse = save_mouse - let &term = save_term - let &ttymouse = save_ttymouse - let &clipboard = save_clipboard - set mousetime& - call delete('Xtest_mouse') - call delete('Xbuf') - endfunc - - " Test for modeless selection in a terminal - func Test_term_modeless_selection() - CheckUnix - CheckNotGui - CheckRunVimInTerminal - CheckFeature clipboard_working - - let save_mouse = &mouse - let save_term = &term - let save_ttymouse = &ttymouse - set mouse=a term=xterm ttymouse=sgr mousetime=200 - set clipboard=autoselectml - - let lines =<< trim END - one two three four five - red green yellow red blue - vim emacs sublime nano - END - call writefile(lines, 'Xtest_modeless') - - " Create a terminal window running Vim for the test with mouse disabled - let prev_win = win_getid() - let buf = RunVimInTerminal('Xtest_modeless -n', {}) - call term_sendkeys(buf, ":set nocompatible\") - call term_sendkeys(buf, ":set mouse=\") - call term_wait(buf) - redraw! - - " Use the mouse to enter the terminal window - call win_gotoid(prev_win) - call feedkeys(MouseLeftClickCode(1, 1), 'x') - call feedkeys(MouseLeftReleaseCode(1, 1), 'x') - call term_wait(buf) - call assert_equal(1, getwininfo(win_getid())[0].terminal) - - " Test for copying a modeless selection to clipboard - let @* = 'clean' - " communicating with X server may take a little time - sleep 100m - call feedkeys(MouseLeftClickCode(2, 3), 'x') - call feedkeys(MouseLeftDragCode(2, 11), 'x') - call feedkeys(MouseLeftReleaseCode(2, 11), 'x') - call assert_equal("d green y", @*) - - " cleanup - call term_wait(buf) - call StopVimInTerminal(buf) - let &mouse = save_mouse - let &term = save_term - let &ttymouse = save_ttymouse - set mousetime& clipboard& - call delete('Xtest_modeless') - new | only! - endfunc - " vim: shiftwidth=2 sts=2 expandtab --- 572,576 ---- *** ../vim-8.2.1176/src/testdir/test_terminal3.vim 2020-07-11 13:06:56.174329383 +0200 --- src/testdir/test_terminal3.vim 2020-07-11 13:08:08.758145241 +0200 *************** *** 0 **** --- 1,523 ---- + " Tests for the terminal window. + " This is split in two, because it can take a lot of time. + " See test_terminal.vim and test_terminal2.vim for further tests. + + source check.vim + CheckFeature terminal + + source shared.vim + source screendump.vim + source mouse.vim + source term_util.vim + + let $PROMPT_COMMAND='' + + func Test_terminal_altscreen() + " somehow doesn't work on MS-Windows + CheckUnix + let cmd = "cat Xtext\" + + let buf = term_start(&shell, {}) + call writefile(["\[?1047h"], 'Xtext') + call term_sendkeys(buf, cmd) + call WaitForAssert({-> assert_equal(1, term_getaltscreen(buf))}) + + call writefile(["\[?1047l"], 'Xtext') + call term_sendkeys(buf, cmd) + call WaitForAssert({-> assert_equal(0, term_getaltscreen(buf))}) + + call term_sendkeys(buf, "exit\r") + exe buf . "bwipe!" + call delete('Xtext') + endfunc + + func Test_terminal_shell_option() + if has('unix') + " exec is a shell builtin command, should fail without a shell. + term exec ls runtest.vim + call WaitForAssert({-> assert_match('job failed', term_getline(bufnr(), 1))}) + bwipe! + + term ++shell exec ls runtest.vim + call WaitForAssert({-> assert_match('runtest.vim', term_getline(bufnr(), 1))}) + bwipe! + elseif has('win32') + " dir is a shell builtin command, should fail without a shell. + try + term dir /b runtest.vim + call WaitForAssert({-> assert_match('job failed\|cannot access .*: No such file or directory', term_getline(bufnr(), 1))}) + catch /CreateProcess/ + " ignore + endtry + bwipe! + + term ++shell dir /b runtest.vim + call WaitForAssert({-> assert_match('runtest.vim', term_getline(bufnr(), 1))}) + bwipe! + endif + endfunc + + func Test_terminal_invalid_arg() + call assert_fails('terminal ++xyz', 'E181:') + endfunc + + func Test_terminal_in_popup() + CheckRunVimInTerminal + + let text =<< trim END + some text + to edit + in a popup window + END + call writefile(text, 'Xtext') + let cmd = GetVimCommandCleanTerm() + let lines = [ + \ 'call setline(1, range(20))', + \ 'hi PopTerm ctermbg=grey', + \ 'func OpenTerm(setColor)', + \ " set noruler", + \ " let s:buf = term_start('" .. cmd .. " Xtext', #{hidden: 1, term_finish: 'close'})", + \ ' let g:winid = popup_create(s:buf, #{minwidth: 45, minheight: 7, border: [], drag: 1, resize: 1})', + \ ' if a:setColor', + \ ' call win_execute(g:winid, "set wincolor=PopTerm")', + \ ' endif', + \ 'endfunc', + \ 'func HidePopup()', + \ ' call popup_hide(g:winid)', + \ 'endfunc', + \ 'func ClosePopup()', + \ ' call popup_close(g:winid)', + \ 'endfunc', + \ 'func ReopenPopup()', + \ ' call popup_create(s:buf, #{minwidth: 40, minheight: 6, border: []})', + \ 'endfunc', + \ ] + call writefile(lines, 'XtermPopup') + let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15}) + call TermWait(buf, 100) + call term_sendkeys(buf, ":call OpenTerm(0)\") + call TermWait(buf, 100) + call term_sendkeys(buf, ":\") + call TermWait(buf, 100) + call term_sendkeys(buf, "\:echo getwinvar(g:winid, \"&buftype\") win_gettype(g:winid)\") + call VerifyScreenDump(buf, 'Test_terminal_popup_1', {}) + + call term_sendkeys(buf, ":q\") + call VerifyScreenDump(buf, 'Test_terminal_popup_2', {}) + + call term_sendkeys(buf, ":call OpenTerm(1)\") + call TermWait(buf, 150) + call term_sendkeys(buf, ":set hlsearch\") + call TermWait(buf, 100) + call term_sendkeys(buf, "/edit\") + call VerifyScreenDump(buf, 'Test_terminal_popup_3', {}) + + call term_sendkeys(buf, "\:call HidePopup()\") + call VerifyScreenDump(buf, 'Test_terminal_popup_4', {}) + call term_sendkeys(buf, "\") + call TermWait(buf, 50) + + call term_sendkeys(buf, "\:call ClosePopup()\") + call VerifyScreenDump(buf, 'Test_terminal_popup_5', {}) + + call term_sendkeys(buf, "\:call ReopenPopup()\") + call VerifyScreenDump(buf, 'Test_terminal_popup_6', {}) + + " Go to terminal-Normal mode and visually select text. + call term_sendkeys(buf, "\Ngg/in\vww") + call VerifyScreenDump(buf, 'Test_terminal_popup_7', {}) + + " Back to job mode, redraws + call term_sendkeys(buf, "A") + call VerifyScreenDump(buf, 'Test_terminal_popup_8', {}) + + call TermWait(buf, 50) + call term_sendkeys(buf, ":q\") + call TermWait(buf, 150) " wait for terminal to vanish + + call StopVimInTerminal(buf) + call delete('Xtext') + call delete('XtermPopup') + endfunc + + " Check a terminal in popup window uses the default mininum size. + func Test_terminal_in_popup_min_size() + CheckRunVimInTerminal + + let text =<< trim END + another text + to show + in a popup window + END + call writefile(text, 'Xtext') + let lines = [ + \ 'call setline(1, range(20))', + \ 'func OpenTerm()', + \ " let s:buf = term_start('cat Xtext', #{hidden: 1})", + \ ' let g:winid = popup_create(s:buf, #{ border: []})', + \ 'endfunc', + \ ] + call writefile(lines, 'XtermPopup') + let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15}) + call TermWait(buf, 100) + call term_sendkeys(buf, ":set noruler\") + call term_sendkeys(buf, ":call OpenTerm()\") + call TermWait(buf, 50) + call term_sendkeys(buf, ":\") + call VerifyScreenDump(buf, 'Test_terminal_popup_m1', {}) + + call TermWait(buf, 50) + call term_sendkeys(buf, ":q\") + call TermWait(buf, 50) " wait for terminal to vanish + call StopVimInTerminal(buf) + call delete('Xtext') + call delete('XtermPopup') + endfunc + + " Check a terminal in popup window with different colors + func Terminal_in_popup_colored(group_name, highlight_cmd, highlight_opt) + CheckRunVimInTerminal + CheckUnix + + let lines = [ + \ 'call setline(1, range(20))', + \ 'func OpenTerm()', + \ " let s:buf = term_start('cat', #{hidden: 1, " + \ .. a:highlight_opt .. "})", + \ ' let g:winid = popup_create(s:buf, #{ border: []})', + \ 'endfunc', + \ a:highlight_cmd, + \ ] + call writefile(lines, 'XtermPopup') + let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15}) + call TermWait(buf, 100) + call term_sendkeys(buf, ":set noruler\") + call term_sendkeys(buf, ":call OpenTerm()\") + call TermWait(buf, 50) + call term_sendkeys(buf, "hello\") + call VerifyScreenDump(buf, 'Test_terminal_popup_' .. a:group_name, {}) + + call term_sendkeys(buf, "\") + call TermWait(buf, 50) + call term_sendkeys(buf, ":q\") + call TermWait(buf, 50) " wait for terminal to vanish + call StopVimInTerminal(buf) + call delete('XtermPopup') + endfunc + + func Test_terminal_in_popup_colored_Terminal() + call Terminal_in_popup_colored("Terminal", "highlight Terminal ctermfg=blue ctermbg=yellow", "") + endfunc + + func Test_terminal_in_popup_colored_group() + call Terminal_in_popup_colored("MyTermCol", "highlight MyTermCol ctermfg=darkgreen ctermbg=lightblue", "term_highlight: 'MyTermCol',") + endfunc + + func Test_double_popup_terminal() + let buf1 = term_start(&shell, #{hidden: 1}) + let win1 = popup_create(buf1, {}) + let buf2 = term_start(&shell, #{hidden: 1}) + call assert_fails('call popup_create(buf2, {})', 'E861:') + call popup_close(win1) + exe buf1 .. 'bwipe!' + exe buf2 .. 'bwipe!' + endfunc + + func Test_issue_5607() + let wincount = winnr('$') + exe 'terminal' &shell &shellcmdflag 'exit' + let job = term_getjob(bufnr()) + call WaitForAssert({-> assert_equal("dead", job_status(job))}) + + let old_wincolor = &wincolor + try + set wincolor= + finally + let &wincolor = old_wincolor + bw! + endtry + endfunc + + func Test_hidden_terminal() + let buf = term_start(&shell, #{hidden: 1}) + call assert_equal('', bufname('^$')) + call StopShellInTerminal(buf) + endfunc + + func Test_term_nasty_callback() + CheckExecutable sh + + set hidden + let g:buf0 = term_start('sh', #{hidden: 1, term_finish: 'close'}) + call popup_create(g:buf0, {}) + call assert_fails("call term_start(['sh', '-c'], #{curwin: 1})", 'E863:') + + call popup_clear(1) + set hidden& + endfunc + + func Test_term_and_startinsert() + CheckRunVimInTerminal + CheckUnix + + let lines =<< trim EOL + put='some text' + term + startinsert + EOL + call writefile(lines, 'XTest_startinsert') + let buf = RunVimInTerminal('-S XTest_startinsert', {}) + + call term_sendkeys(buf, "exit\r") + call WaitForAssert({-> assert_equal("some text", term_getline(buf, 1))}) + call term_sendkeys(buf, "0l") + call term_sendkeys(buf, "A<\") + call WaitForAssert({-> assert_equal("some text<", term_getline(buf, 1))}) + + call StopVimInTerminal(buf) + call delete('XTest_startinsert') + endfunc + + " Test for passing invalid arguments to terminal functions + func Test_term_func_invalid_arg() + call assert_fails('let b = term_getaltscreen([])', 'E745:') + call assert_fails('let a = term_getattr(1, [])', 'E730:') + call assert_fails('let c = term_getcursor([])', 'E745:') + call assert_fails('let l = term_getline([], 1)', 'E745:') + call assert_fails('let l = term_getscrolled([])', 'E745:') + call assert_fails('let s = term_getsize([])', 'E745:') + call assert_fails('let s = term_getstatus([])', 'E745:') + call assert_fails('let s = term_scrape([], 1)', 'E745:') + call assert_fails('call term_sendkeys([], "a")', 'E745:') + call assert_fails('call term_setapi([], "")', 'E745:') + call assert_fails('call term_setrestore([], "")', 'E745:') + call assert_fails('call term_setkill([], "")', 'E745:') + if has('gui') || has('termguicolors') + call assert_fails('let p = term_getansicolors([])', 'E745:') + call assert_fails('call term_setansicolors([], [])', 'E745:') + endif + endfunc + + " Test for sending various special keycodes to a terminal + func Test_term_keycode_translation() + CheckRunVimInTerminal + + let buf = RunVimInTerminal('', {}) + call term_sendkeys(buf, ":set nocompatible\") + + let keys = ["\", "\", "\", "\", "\", "\", "\", + \ "\", "\", "\", "\", "\", "\", + \ "\", "\", "\", "\", "\", + \ "\", "\", "\", "\", "\", "\", + \ "\", "\", "\", "\", "\", + \ "\"] + let output = ['', '', '', '', '', '', '', + \ '', '', '', '', '', '', '', + \ '', '', '', '', '', '', + \ '', '', '', '', '', + \ '', '', '', '', ''] + + call term_sendkeys(buf, "i") + for i in range(len(keys)) + call term_sendkeys(buf, "\\" .. keys[i]) + call WaitForAssert({-> assert_equal(output[i], term_getline(buf, 1))}) + endfor + + let keypad_keys = ["\", "\", "\", "\", "\", "\", + \ "\", "\", "\", "\", "\", "\", + \ "\", "\", "\"] + let keypad_output = ['0', '1', '2', '3', '4', '5', + \ '6', '7', '8', '9', '.', '+', + \ '-', '*', '/'] + for i in range(len(keypad_keys)) + " TODO: Mysteriously keypad 3 and 9 do not work on some systems. + if keypad_output[i] == '3' || keypad_output[i] == '9' + continue + endif + call term_sendkeys(buf, "\" .. keypad_keys[i]) + call WaitForAssert({-> assert_equal(keypad_output[i], term_getline(buf, 1))}) + endfor + + call feedkeys("\\\one\.two", 'xt') + call WaitForAssert({-> assert_equal('two', term_getline(buf, 1))}) + + call StopVimInTerminal(buf) + endfunc + + " Test for using the mouse in a terminal + func Test_term_mouse() + CheckNotGui + CheckRunVimInTerminal + + let save_mouse = &mouse + let save_term = &term + let save_ttymouse = &ttymouse + let save_clipboard = &clipboard + set mouse=a term=xterm ttymouse=sgr mousetime=200 clipboard= + + let lines =<< trim END + one two three four five + red green yellow red blue + vim emacs sublime nano + END + call writefile(lines, 'Xtest_mouse') + + " Create a terminal window running Vim for the test with mouse enabled + let prev_win = win_getid() + let buf = RunVimInTerminal('Xtest_mouse -n', {}) + call term_sendkeys(buf, ":set nocompatible\") + call term_sendkeys(buf, ":set mouse=a term=xterm ttymouse=sgr\") + call term_sendkeys(buf, ":set clipboard=\") + call term_sendkeys(buf, ":set mousemodel=extend\") + call term_wait(buf) + redraw! + + " Use the mouse to enter the terminal window + call win_gotoid(prev_win) + call feedkeys(MouseLeftClickCode(1, 1), 'x') + call feedkeys(MouseLeftReleaseCode(1, 1), 'x') + call assert_equal(1, getwininfo(win_getid())[0].terminal) + + " Test for click/release + call test_setmouse(2, 5) + call feedkeys("\\", 'xt') + call test_setmouse(3, 8) + call term_sendkeys(buf, "\\") + call term_wait(buf, 50) + call term_sendkeys(buf, ":call writefile([json_encode(getpos('.'))], 'Xbuf')\") + call term_wait(buf, 50) + let pos = json_decode(readfile('Xbuf')[0]) + call assert_equal([3, 8], pos[1:2]) + + " Test for selecting text using mouse + call delete('Xbuf') + call test_setmouse(2, 11) + call term_sendkeys(buf, "\") + call test_setmouse(2, 16) + call term_sendkeys(buf, "\y") + call term_wait(buf, 50) + call term_sendkeys(buf, ":call writefile([@\"], 'Xbuf')\") + call term_wait(buf, 50) + call assert_equal('yellow', readfile('Xbuf')[0]) + + " Test for selecting text using doubleclick + call delete('Xbuf') + call test_setmouse(1, 11) + call term_sendkeys(buf, "\\\") + call test_setmouse(1, 17) + call term_sendkeys(buf, "\y") + call term_wait(buf, 50) + call term_sendkeys(buf, ":call writefile([@\"], 'Xbuf')\") + call term_wait(buf, 50) + call assert_equal('three four', readfile('Xbuf')[0]) + + " Test for selecting a line using triple click + call delete('Xbuf') + call test_setmouse(3, 2) + call term_sendkeys(buf, "\\\\\\y") + call term_wait(buf, 50) + call term_sendkeys(buf, ":call writefile([@\"], 'Xbuf')\") + call term_wait(buf, 50) + call assert_equal("vim emacs sublime nano\n", readfile('Xbuf')[0]) + + " Test for selecting a block using qudraple click + call delete('Xbuf') + call test_setmouse(1, 11) + call term_sendkeys(buf, "\\\\\\\") + call test_setmouse(3, 13) + call term_sendkeys(buf, "\y") + call term_wait(buf, 50) + call term_sendkeys(buf, ":call writefile([@\"], 'Xbuf')\") + call term_wait(buf, 50) + call assert_equal("ree\nyel\nsub", readfile('Xbuf')[0]) + + " Test for extending a selection using right click + call delete('Xbuf') + call test_setmouse(2, 9) + call term_sendkeys(buf, "\\") + call test_setmouse(2, 16) + call term_sendkeys(buf, "\\y") + call term_wait(buf, 50) + call term_sendkeys(buf, ":call writefile([@\"], 'Xbuf')\") + call term_wait(buf, 50) + call assert_equal("n yellow", readfile('Xbuf')[0]) + + " Test for pasting text using middle click + call delete('Xbuf') + call term_sendkeys(buf, ":let @r='bright '\") + call test_setmouse(2, 22) + call term_sendkeys(buf, "\"r\\") + call term_wait(buf, 50) + call term_sendkeys(buf, ":call writefile([getline(2)], 'Xbuf')\") + call term_wait(buf, 50) + call assert_equal("red bright blue", readfile('Xbuf')[0][-15:]) + + " cleanup + call term_wait(buf) + call StopVimInTerminal(buf) + let &mouse = save_mouse + let &term = save_term + let &ttymouse = save_ttymouse + let &clipboard = save_clipboard + set mousetime& + call delete('Xtest_mouse') + call delete('Xbuf') + endfunc + + " Test for modeless selection in a terminal + func Test_term_modeless_selection() + CheckUnix + CheckNotGui + CheckRunVimInTerminal + CheckFeature clipboard_working + + let save_mouse = &mouse + let save_term = &term + let save_ttymouse = &ttymouse + set mouse=a term=xterm ttymouse=sgr mousetime=200 + set clipboard=autoselectml + + let lines =<< trim END + one two three four five + red green yellow red blue + vim emacs sublime nano + END + call writefile(lines, 'Xtest_modeless') + + " Create a terminal window running Vim for the test with mouse disabled + let prev_win = win_getid() + let buf = RunVimInTerminal('Xtest_modeless -n', {}) + call term_sendkeys(buf, ":set nocompatible\") + call term_sendkeys(buf, ":set mouse=\") + call term_wait(buf) + redraw! + + " Use the mouse to enter the terminal window + call win_gotoid(prev_win) + call feedkeys(MouseLeftClickCode(1, 1), 'x') + call feedkeys(MouseLeftReleaseCode(1, 1), 'x') + call term_wait(buf) + call assert_equal(1, getwininfo(win_getid())[0].terminal) + + " Test for copying a modeless selection to clipboard + let @* = 'clean' + " communicating with X server may take a little time + sleep 100m + call feedkeys(MouseLeftClickCode(2, 3), 'x') + call feedkeys(MouseLeftDragCode(2, 11), 'x') + call feedkeys(MouseLeftReleaseCode(2, 11), 'x') + call assert_equal("d green y", @*) + + " cleanup + call term_wait(buf) + call StopVimInTerminal(buf) + let &mouse = save_mouse + let &term = save_term + let &ttymouse = save_ttymouse + set mousetime& clipboard& + call delete('Xtest_modeless') + new | only! + endfunc + + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1176/src/testdir/Make_all.mak 2020-07-03 21:17:31.339914463 +0200 --- src/testdir/Make_all.mak 2020-07-11 12:31:02.768814457 +0200 *************** *** 272,277 **** --- 272,278 ---- test_termencoding \ test_terminal \ test_terminal2 \ + test_terminal3 \ test_terminal_fail \ test_textformat \ test_textobjects \ *************** *** 488,493 **** --- 489,495 ---- test_termencoding.res \ test_terminal.res \ test_terminal2.res \ + test_terminal3.res \ test_terminal_fail.res \ test_textformat.res \ test_textobjects.res \ *** ../vim-8.2.1176/src/testdir/runtest.vim 2020-06-21 20:39:33.384443962 +0200 --- src/testdir/runtest.vim 2020-07-11 13:09:03.174007680 +0200 *************** *** 45,50 **** --- 45,55 ---- " Without the +eval feature we can't run these tests, bail out. so small.vim + " In the GUI we can always change the screen size. + if has('gui_running') + set columns=80 lines=25 + endif + " Check that the screen size is at least 24 x 80 characters. if &lines < 24 || &columns < 80 let error = 'Screen size too small! Tests require at least 24 lines with 80 characters, got ' .. &lines .. ' lines with ' .. &columns .. ' characters' *** ../vim-8.2.1176/src/version.c 2020-07-10 22:45:35.029135161 +0200 --- src/version.c 2020-07-11 12:33:53.452475995 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1177, /**/ -- login: yes password: I don't know, please tell me password is incorrect login: yes password: incorrect /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///