diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2024-01-03 02:09:18 +0100 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2024-01-03 02:09:29 +0100 |
commit | 04f2f864e270e772c6326cefdf24947f0130e492 (patch) | |
tree | 46f83f909b888a66c741032ab955afc6eab84292 /test/functional/terminal/tui_spec.lua | |
parent | 59d117ec99b6037cb9fad5bbfb6d0b18f5012927 (diff) | |
download | rneovim-04f2f864e270e772c6326cefdf24947f0130e492.tar.gz rneovim-04f2f864e270e772c6326cefdf24947f0130e492.tar.bz2 rneovim-04f2f864e270e772c6326cefdf24947f0130e492.zip |
refactor: format test/*
Diffstat (limited to 'test/functional/terminal/tui_spec.lua')
-rw-r--r-- | test/functional/terminal/tui_spec.lua | 1209 |
1 files changed, 740 insertions, 469 deletions
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua index a4e3c1d199..831075fc08 100644 --- a/test/functional/terminal/tui_spec.lua +++ b/test/functional/terminal/tui_spec.lua @@ -30,7 +30,9 @@ local spawn_argv = helpers.spawn_argv local set_session = helpers.set_session local write_file = helpers.write_file -if helpers.skip(is_os('win')) then return end +if helpers.skip(is_os('win')) then + return +end describe('TUI', function() local screen @@ -41,11 +43,16 @@ describe('TUI', function() clear() local child_server = new_pipename() screen = thelpers.setup_child_nvim({ - '--listen', child_server, - '-u', 'NONE', - '-i', 'NONE', - '--cmd', nvim_set .. ' notermguicolors laststatus=2 background=dark', - '--cmd', 'colorscheme vim' + '--listen', + child_server, + '-u', + 'NONE', + '-i', + 'NONE', + '--cmd', + nvim_set .. ' notermguicolors laststatus=2 background=dark', + '--cmd', + 'colorscheme vim', }) screen:expect([[ {1: } | @@ -78,7 +85,7 @@ describe('TUI', function() it('rapid resize #7572 #7628', function() helpers.skip(helpers.is_asan(), 'Test extra unstable with ASAN. See #23762') -- Need buffer rows to provoke the behavior. - feed_data(":edit test/functional/fixtures/bigfile.txt\n") + feed_data(':edit test/functional/fixtures/bigfile.txt\n') screen:expect([[ {1:0}000;<control>;Cc;0;BN;;;;;N;NULL;;;; | 0001;<control>;Cc;0;BN;;;;;N;START OF HEADING;;;; | @@ -105,21 +112,26 @@ describe('TUI', function() screen:try_resize(57, 17) command('call jobresize(b:terminal_job_id, 57, 17)') retry(nil, nil, function() - eq({true, 57}, {child_session:request('nvim_win_get_width', 0)}) + eq({ true, 57 }, { child_session:request('nvim_win_get_width', 0) }) end) end) it('accepts resize while pager is active', function() - child_session:request('nvim_exec2', [[ + child_session:request( + 'nvim_exec2', + [[ set more func! ManyErr() for i in range(20) echoerr "FAIL ".i endfor endfunc - ]], {}) + ]], + {} + ) feed_data(':call ManyErr()\r') - screen:expect{grid=[[ + screen:expect { + grid = [[ {8:Error detected while processing function ManyErr:} | {11:line 2:} | {8:FAIL 0} | @@ -127,10 +139,12 @@ describe('TUI', function() {8:FAIL 2} | {10:-- More --}{1: } | {3:-- TERMINAL --} | - ]]} + ]], + } - screen:try_resize(50,10) - screen:expect{grid=[[ + screen:try_resize(50, 10) + screen:expect { + grid = [[ :call ManyErr() | {8:Error detected while processing function ManyErr:} | {11:line 2:} | @@ -140,10 +154,12 @@ describe('TUI', function() |*2 {10:-- More --}{1: } | {3:-- TERMINAL --} | - ]]} + ]], + } feed_data('j') - screen:expect{grid=[[ + screen:expect { + grid = [[ {8:Error detected while processing function ManyErr:} | {11:line 2:} | {8:FAIL 0} | @@ -154,10 +170,12 @@ describe('TUI', function() {8:FAIL 5} | {10:-- More --}{1: } | {3:-- TERMINAL --} | - ]]} + ]], + } - screen:try_resize(50,7) - screen:expect{grid=[[ + screen:try_resize(50, 7) + screen:expect { + grid = [[ {8:FAIL 1} | {8:FAIL 2} | {8:FAIL 3} | @@ -165,28 +183,34 @@ describe('TUI', function() {8:FAIL 5} | {10:-- More --}{1: } | {3:-- TERMINAL --} | - ]]} + ]], + } - screen:try_resize(50,5) - screen:expect{grid=[[ + screen:try_resize(50, 5) + screen:expect { + grid = [[ {8:FAIL 3} | {8:FAIL 4} | {8:FAIL 5} | {10:-- More --}{1: } | {3:-- TERMINAL --} | - ]]} + ]], + } feed_data('g') - screen:expect{grid=[[ + screen:expect { + grid = [[ :call ManyErr() | {8:Error detected while processing function ManyErr:} | {11:line 2:} | {10:-- More --}{1: } | {3:-- TERMINAL --} | - ]]} + ]], + } - screen:try_resize(50,10) - screen:expect{grid=[[ + screen:try_resize(50, 10) + screen:expect { + grid = [[ :call ManyErr() | {8:Error detected while processing function ManyErr:} | {11:line 2:} | @@ -197,16 +221,19 @@ describe('TUI', function() {8:FAIL 4} | {10:-- More --}{1: } | {3:-- TERMINAL --} | - ]]} + ]], + } feed_data('\003') - screen:expect{grid=[[ + screen:expect { + grid = [[ {1: } | {4:~ }|*6 {5:[No Name] }| | {3:-- TERMINAL --} | - ]]} + ]], + } end) it('accepts basic utf-8 input', function() @@ -235,8 +262,8 @@ describe('TUI', function() it('interprets leading <Esc> byte as ALT modifier in normal-mode', function() local keys = 'dfghjkl' for c in keys:gmatch('.') do - feed_data(':nnoremap <a-'..c..'> ialt-'..c..'<cr><esc>\r') - feed_data('\027'..c) + feed_data(':nnoremap <a-' .. c .. '> ialt-' .. c .. '<cr><esc>\r') + feed_data('\027' .. c) end screen:expect([[ alt-j | @@ -273,11 +300,15 @@ describe('TUI', function() end) it('interprets <Esc>[27u as <Esc>', function() - child_session:request('nvim_exec2', [[ + child_session:request( + 'nvim_exec2', + [[ nnoremap <M-;> <Nop> nnoremap <Esc> AESC<Esc> nnoremap ; Asemicolon<Esc> - ]], {}) + ]], + {} + ) feed_data('\027[27u;') screen:expect([[ ESCsemicolo{1:n} | @@ -308,22 +339,29 @@ describe('TUI', function() feed_data('\022\022') -- ctrl+v feed_data('\022\013') -- ctrl+m local attrs = screen:get_default_attr_ids() - attrs[11] = {foreground = 81} - screen:expect([[ + attrs[11] = { foreground = 81 } + screen:expect( + [[ {11:^G^V^M}{1: } | {4:~ }|*3 {5:[No Name] [+] }| {3:-- INSERT --} | {3:-- TERMINAL --} | - ]], attrs) + ]], + attrs + ) end) local function test_mouse_wheel(esc) - child_session:request('nvim_exec2', [[ + child_session:request( + 'nvim_exec2', + [[ set number nostartofline nowrap mousescroll=hor:1,ver:1 call setline(1, repeat([join(range(10), '----')], 10)) vsplit - ]], {}) + ]], + {} + ) screen:expect([[ {11: 1 }{1:0}----1----2----3----4│{11: 1 }0----1----2----3----| {11: 2 }0----1----2----3----4│{11: 2 }0----1----2----3----| @@ -586,7 +624,9 @@ describe('TUI', function() end) local function test_mouse_popup(esc) - child_session:request('nvim_exec2', [[ + child_session:request( + 'nvim_exec2', + [[ call setline(1, 'popup menu test') set mouse=a mousemodel=popup @@ -596,7 +636,9 @@ describe('TUI', function() menu PopUp.baz :let g:menustr = 'baz'<CR> highlight Pmenu ctermbg=NONE ctermfg=NONE cterm=underline,reverse highlight PmenuSel ctermbg=NONE ctermfg=NONE cterm=underline,reverse,bold - ]], {}) + ]], + {} + ) if esc then feed_data('\027[<2;5;1M') else @@ -825,11 +867,15 @@ describe('TUI', function() | {3:-- TERMINAL --} | ]]) - child_session:request('nvim_exec2', [[ + child_session:request( + 'nvim_exec2', + [[ tab split tabnew highlight Tabline ctermbg=NONE ctermfg=NONE cterm=underline - ]], {}) + ]], + {} + ) screen:expect([[ {12: + [No Name] + [No Name] }{3: [No Name] }{1: }{12:X}| {1: } | @@ -861,15 +907,15 @@ describe('TUI', function() it('supports Super and Meta modifiers', function() feed_data('i') - feed_data('\022\027[106;9u') -- Super + j - feed_data('\022\027[107;33u') -- Meta + k - feed_data('\022\027[13;41u') -- Super + Meta + Enter - feed_data('\022\027[127;48u') -- Shift + Alt + Ctrl + Super + Meta + Backspace + feed_data('\022\027[106;9u') -- Super + j + feed_data('\022\027[107;33u') -- Meta + k + feed_data('\022\027[13;41u') -- Super + Meta + Enter + feed_data('\022\027[127;48u') -- Shift + Alt + Ctrl + Super + Meta + Backspace feed_data('\n') - feed_data('\022\027[57376;9u') -- Super + F13 - feed_data('\022\027[57377;33u') -- Meta + F14 - feed_data('\022\027[57378;41u') -- Super + Meta + F15 - feed_data('\022\027[57379;48u') -- Shift + Alt + Ctrl + Super + Meta + F16 + feed_data('\022\027[57376;9u') -- Super + F13 + feed_data('\022\027[57377;33u') -- Meta + F14 + feed_data('\022\027[57378;41u') -- Super + Meta + F15 + feed_data('\022\027[57379;48u') -- Shift + Alt + Ctrl + Super + Meta + F16 screen:expect([[ <D-j><T-k><T-D-CR><M-T-C-S-D-BS> | <D-F13><T-F14><T-D-F15><M-T-C-S-D-F16>{1: } | @@ -891,7 +937,7 @@ describe('TUI', function() {3:-- TERMINAL --} | ]]) feed_data('pasted from terminal') - expect_child_buf_lines({'"pasted from terminal"'}) + expect_child_buf_lines({ '"pasted from terminal"' }) screen:expect([[ "pasted from terminal{1:"} | {4:~ }|*3 @@ -899,8 +945,8 @@ describe('TUI', function() {3:-- INSERT --} | {3:-- TERMINAL --} | ]]) - feed_data('\027[201~') -- End paste. - feed_data('\027[27u') -- ESC: go to Normal mode. + feed_data('\027[201~') -- End paste. + feed_data('\027[27u') -- ESC: go to Normal mode. wait_for_mode('n') screen:expect([[ "pasted from termina{1:l}" | @@ -911,7 +957,7 @@ describe('TUI', function() ]]) -- Dot-repeat/redo. feed_data('2.') - expect_child_buf_lines({'"pasted from terminapasted from terminalpasted from terminall"'}) + expect_child_buf_lines({ '"pasted from terminapasted from terminalpasted from terminall"' }) screen:expect([[ "pasted from terminapasted from terminalpasted fro| m termina{1:l}l" | @@ -922,17 +968,18 @@ describe('TUI', function() ]]) -- Undo. feed_data('u') - expect_child_buf_lines({'"pasted from terminal"'}) + expect_child_buf_lines({ '"pasted from terminal"' }) feed_data('u') - expect_child_buf_lines({'""'}) + expect_child_buf_lines({ '""' }) feed_data('u') - expect_child_buf_lines({''}) + expect_child_buf_lines({ '' }) end) it('paste: select-mode', function() feed_data('ithis is line 1\nthis is line 2\nline 3 is here\n\027') wait_for_mode('n') - screen:expect{grid=[[ + screen:expect { + grid = [[ this is line 1 | this is line 2 | line 3 is here | @@ -940,32 +987,35 @@ describe('TUI', function() {5:[No Name] [+] }| | {3:-- TERMINAL --} | - ]]} + ]], + } -- Select-mode. Use <C-n> to move down. feed_data('gg04lgh\14\14') wait_for_mode('s') feed_data('\027[200~') feed_data('just paste it™') feed_data('\027[201~') - screen:expect{grid=[[ + screen:expect { + grid = [[ thisjust paste it{1:™}3 is here | | {4:~ }|*2 {5:[No Name] [+] }| | {3:-- TERMINAL --} | - ]]} + ]], + } -- Undo. feed_data('u') - expect_child_buf_lines{ + expect_child_buf_lines { 'this is line 1', 'this is line 2', 'line 3 is here', '', } -- Redo. - feed_data('\18') -- <C-r> - expect_child_buf_lines{ + feed_data('\18') -- <C-r> + expect_child_buf_lines { 'thisjust paste it™3 is here', '', } @@ -973,28 +1023,32 @@ describe('TUI', function() it('paste: terminal mode', function() if is_ci('github') then - pending("tty-test complains about not owning the terminal -- actions/runner#241") + pending('tty-test complains about not owning the terminal -- actions/runner#241') end child_exec_lua('vim.o.statusline="^^^^^^^"') child_exec_lua('vim.cmd.terminal(...)', testprg('tty-test')) feed_data('i') - screen:expect{grid=[[ + screen:expect { + grid = [[ tty ready | {1: } | |*2 {5:^^^^^^^ }| {3:-- TERMINAL --} |*2 - ]]} + ]], + } feed_data('\027[200~') feed_data('hallo') feed_data('\027[201~') - screen:expect{grid=[[ + screen:expect { + grid = [[ tty ready | hallo{1: } | |*2 {5:^^^^^^^ }| {3:-- TERMINAL --} |*2 - ]]} + ]], + } end) it('paste: normal-mode (+CRLF #10872)', function() @@ -1002,8 +1056,8 @@ describe('TUI', function() wait_for_mode('c') feed_data('\n') wait_for_mode('n') - local expected_lf = {'line 1', 'ESC:\027 / CR: \rx'} - local expected_crlf = {'line 1', 'ESC:\027 / CR: ', 'x'} + local expected_lf = { 'line 1', 'ESC:\027 / CR: \rx' } + local expected_crlf = { 'line 1', 'ESC:\027 / CR: ', 'x' } local expected_grid1 = [[ line 1 | ESC:{11:^[} / CR: | @@ -1014,19 +1068,20 @@ describe('TUI', function() {3:-- TERMINAL --} | ]] local expected_attr = { - [1] = {reverse = true}, - [3] = {bold = true}, - [4] = {foreground = tonumber('0x00000c')}, - [5] = {bold = true, reverse = true}, - [11] = {foreground = tonumber('0x000051')}, - [12] = {reverse = true, foreground = tonumber('0x000051')}, + [1] = { reverse = true }, + [3] = { bold = true }, + [4] = { foreground = tonumber('0x00000c') }, + [5] = { bold = true, reverse = true }, + [11] = { foreground = tonumber('0x000051') }, + [12] = { reverse = true, foreground = tonumber('0x000051') }, } -- "bracketed paste" - feed_data('\027[200~'..table.concat(expected_lf,'\n')..'\027[201~') - screen:expect{grid=expected_grid1, attr_ids=expected_attr} + feed_data('\027[200~' .. table.concat(expected_lf, '\n') .. '\027[201~') + screen:expect { grid = expected_grid1, attr_ids = expected_attr } -- Dot-repeat/redo. feed_data('.') - screen:expect{grid=[[ + screen:expect { + grid = [[ ESC:{11:^[} / CR: | xline 1 | ESC:{11:^[} / CR: | @@ -1034,64 +1089,69 @@ describe('TUI', function() {5:[No Name] [+] 5,1 Bot}| | {3:-- TERMINAL --} | - ]], attr_ids=expected_attr} + ]], + attr_ids = expected_attr, + } -- Undo. feed_data('u') expect_child_buf_lines(expected_crlf) feed_data('u') - expect_child_buf_lines({''}) + expect_child_buf_lines({ '' }) feed_data(':echo') wait_for_mode('c') feed_data('\n') wait_for_mode('n') -- CRLF input - feed_data('\027[200~'..table.concat(expected_lf,'\r\n')..'\027[201~') - screen:expect{grid=expected_grid1, attr_ids=expected_attr} + feed_data('\027[200~' .. table.concat(expected_lf, '\r\n') .. '\027[201~') + screen:expect { grid = expected_grid1, attr_ids = expected_attr } expect_child_buf_lines(expected_crlf) end) it('paste: cmdline-mode inserts 1 line', function() - feed_data('ifoo\n') -- Insert some text (for dot-repeat later). - feed_data('\027:""') -- Enter Cmdline-mode. - feed_data('\027[D') -- <Left> to place cursor between quotes. + feed_data('ifoo\n') -- Insert some text (for dot-repeat later). + feed_data('\027:""') -- Enter Cmdline-mode. + feed_data('\027[D') -- <Left> to place cursor between quotes. wait_for_mode('c') -- "bracketed paste" feed_data('\027[200~line 1\nline 2\n') wait_for_mode('c') feed_data('line 3\nline 4\n\027[201~') wait_for_mode('c') - screen:expect{grid=[[ + screen:expect { + grid = [[ foo | | {4:~ }|*2 {5:[No Name] [+] }| :"line 1{1:"} | {3:-- TERMINAL --} | - ]]} + ]], + } -- Dot-repeat/redo. feed_data('\027[27u') wait_for_mode('n') feed_data('.') - screen:expect{grid=[[ + screen:expect { + grid = [[ foo |*2 {1: } | {4:~ }| {5:[No Name] [+] }| | {3:-- TERMINAL --} | - ]]} + ]], + } end) it('paste: cmdline-mode collects chunks of unfinished line', function() local function expect_cmdline(expected) retry(nil, nil, function() - local _, cmdline = child_session:request( - 'nvim_call_function', 'getcmdline', {}) + local _, cmdline = child_session:request('nvim_call_function', 'getcmdline', {}) eq(expected, cmdline) end) end - feed_data('\027:""') -- Enter Cmdline-mode. - feed_data('\027[D') -- <Left> to place cursor between quotes. + feed_data('\027:""') -- Enter Cmdline-mode. + feed_data('\027[D') -- <Left> to place cursor between quotes. wait_for_mode('c') feed_data('\027[200~stuff 1 ') expect_cmdline('"stuff 1 "') @@ -1107,26 +1167,33 @@ describe('TUI', function() end) it('paste: recovers from vim.paste() failure', function() - child_session:request('nvim_exec_lua', [[ + child_session:request( + 'nvim_exec_lua', + [[ _G.save_paste_fn = vim.paste -- Stack traces for this test are non-deterministic, so disable them _G.debug.traceback = function(msg) return msg end vim.paste = function(lines, phase) error("fake fail") end - ]], {}) + ]], + {} + ) -- Prepare something for dot-repeat/redo. feed_data('ifoo\n\027[27u') wait_for_mode('n') - screen:expect{grid=[[ + screen:expect { + grid = [[ foo | {1: } | {4:~ }|*2 {5:[No Name] [+] }| | {3:-- TERMINAL --} | - ]]} + ]], + } -- Start pasting... feed_data('\027[200~line 1\nline 2\n') - screen:expect{grid=[[ + screen:expect { + grid = [[ foo | | {5: }| @@ -1134,42 +1201,52 @@ describe('TUI', function() {8:ake fail} | {10:Press ENTER or type command to continue}{1: } | {3:-- TERMINAL --} | - ]]} + ]], + } -- Remaining chunks are discarded after vim.paste() failure. feed_data('line 3\nline 4\n') feed_data('line 5\nline 6\n') feed_data('line 7\nline 8\n') -- Stop paste. feed_data('\027[201~') - feed_data('\n') -- <CR> - expect_child_buf_lines({'foo',''}) + feed_data('\n') -- <CR> + expect_child_buf_lines({ 'foo', '' }) --Dot-repeat/redo is not modified by failed paste. feed_data('.') - screen:expect{grid=[[ + screen:expect { + grid = [[ foo |*2 {1: } | {4:~ }| {5:[No Name] [+] }| | {3:-- TERMINAL --} | - ]]} + ]], + } -- Editor should still work after failed/drained paste. feed_data('ityped input...\027[27u') - screen:expect{grid=[[ + screen:expect { + grid = [[ foo |*2 typed input..{1:.} | {4:~ }| {5:[No Name] [+] }| | {3:-- TERMINAL --} | - ]]} + ]], + } -- Paste works if vim.paste() succeeds. - child_session:request('nvim_exec_lua', [[ + child_session:request( + 'nvim_exec_lua', + [[ vim.paste = _G.save_paste_fn - ]], {}) + ]], + {} + ) feed_data('\027[200~line A\nline B\n\027[201~') - feed_data('\n') -- <CR> - screen:expect{grid=[[ + feed_data('\n') -- <CR> + screen:expect { + grid = [[ foo | typed input...line A | line B | @@ -1177,28 +1254,38 @@ describe('TUI', function() {5:[No Name] [+] }| | {3:-- TERMINAL --} | - ]]} + ]], + } end) it('paste: vim.paste() cancel (retval=false) #10865', function() -- This test only exercises the "cancel" case. Use-case would be "dangling -- paste", but that is not implemented yet. #10865 - child_session:request('nvim_exec_lua', [[ + child_session:request( + 'nvim_exec_lua', + [[ vim.paste = function(lines, phase) return false end - ]], {}) + ]], + {} + ) feed_data('\027[200~line A\nline B\n\027[201~') feed_data('ifoo\n\027[27u') - expect_child_buf_lines({'foo',''}) + expect_child_buf_lines({ 'foo', '' }) end) it("paste: 'nomodifiable' buffer", function() child_session:request('nvim_command', 'set nomodifiable') - child_session:request('nvim_exec_lua', [[ + child_session:request( + 'nvim_exec_lua', + [[ -- Truncate the error message to hide the line number _G.debug.traceback = function(msg) return msg:sub(-49) end - ]], {}) + ]], + {} + ) feed_data('\027[200~fail 1\nfail 2\n\027[201~') - screen:expect{grid=[[ + screen:expect { + grid = [[ | {4:~ }| {5: }| @@ -1206,11 +1293,13 @@ describe('TUI', function() {8:hanges, 'modifiable' is off} | {10:Press ENTER or type command to continue}{1: } | {3:-- TERMINAL --} | - ]]} - feed_data('\n') -- <Enter> + ]], + } + feed_data('\n') -- <Enter> child_session:request('nvim_command', 'set modifiable') feed_data('\027[200~success 1\nsuccess 2\n\027[201~') - screen:expect{grid=[[ + screen:expect { + grid = [[ success 1 | success 2 | {1: } | @@ -1218,7 +1307,8 @@ describe('TUI', function() {5:[No Name] [+] }| | {3:-- TERMINAL --} | - ]]} + ]], + } end) it('paste: exactly 64 bytes #10311', function() @@ -1226,10 +1316,10 @@ describe('TUI', function() feed_data('i') wait_for_mode('i') -- "bracketed paste" - feed_data('\027[200~'..expected..'\027[201~') - expect_child_buf_lines({expected}) + feed_data('\027[200~' .. expected .. '\027[201~') + expect_child_buf_lines({ expected }) feed_data(' end') - expected = expected..' end' + expected = expected .. ' end' screen:expect([[ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz| zzzzzzzzzzzzzz end{1: } | @@ -1238,7 +1328,7 @@ describe('TUI', function() {3:-- INSERT --} | {3:-- TERMINAL --} | ]]) - expect_child_buf_lines({expected}) + expect_child_buf_lines({ expected }) end) it('paste: less-than sign in cmdline #11088', function() @@ -1246,14 +1336,16 @@ describe('TUI', function() feed_data(':') wait_for_mode('c') -- "bracketed paste" - feed_data('\027[200~'..expected..'\027[201~') - screen:expect{grid=[[ + feed_data('\027[200~' .. expected .. '\027[201~') + screen:expect { + grid = [[ | {4:~ }|*3 {5:[No Name] }| :<{1: } | {3:-- TERMINAL --} | - ]]} + ]], + } end) it('paste: big burst of input', function() @@ -1265,7 +1357,7 @@ describe('TUI', function() feed_data('i') wait_for_mode('i') -- "bracketed paste" - feed_data('\027[200~'..table.concat(t, '\n')..'\027[201~') + feed_data('\027[200~' .. table.concat(t, '\n') .. '\027[201~') expect_child_buf_lines(t) feed_data(' end') screen:expect([[ @@ -1277,7 +1369,7 @@ describe('TUI', function() {3:-- INSERT --} | {3:-- TERMINAL --} | ]]) - feed_data('\027[27u') -- ESC: go to Normal mode. + feed_data('\027[27u') -- ESC: go to Normal mode. wait_for_mode('n') -- Dot-repeat/redo. feed_data('.') @@ -1305,7 +1397,8 @@ describe('TUI', function() -- Send the "stop paste" sequence. feed_data('\027[201~') - screen:expect{grid=[[ + screen:expect { + grid = [[ | pasted from terminal (1) | {6:^[}[200~ | @@ -1313,14 +1406,16 @@ describe('TUI', function() {5:[No Name] [+] }| {3:-- INSERT --} | {3:-- TERMINAL --} | - ]], attr_ids={ - [1] = {reverse = true}, - [2] = {background = tonumber('0x00000b')}, - [3] = {bold = true}, - [4] = {foreground = tonumber('0x00000c')}, - [5] = {bold = true, reverse = true}, - [6] = {foreground = tonumber('0x000051')}, - }} + ]], + attr_ids = { + [1] = { reverse = true }, + [2] = { background = tonumber('0x00000b') }, + [3] = { bold = true }, + [4] = { foreground = tonumber('0x00000c') }, + [5] = { bold = true, reverse = true }, + [6] = { foreground = tonumber('0x000051') }, + }, + } end) it('paste: ignores spurious "stop paste" code', function() @@ -1340,13 +1435,15 @@ describe('TUI', function() it('paste: split "start paste" code', function() feed_data('i') - screen:expect{grid=[[ + screen:expect { + grid = [[ {1: } | {4:~ }|*3 {5:[No Name] }| {3:-- INSERT --} | {3:-- TERMINAL --} | - ]]} + ]], + } -- Send split "start paste" sequence. feed_data('\027[2') feed_data('00~pasted from terminal\027[201~') @@ -1361,13 +1458,15 @@ describe('TUI', function() it('paste: split "stop paste" code', function() feed_data('i') - screen:expect{grid=[[ + screen:expect { + grid = [[ {1: } | {4:~ }|*3 {5:[No Name] }| {3:-- INSERT --} | {3:-- TERMINAL --} | - ]]} + ]], + } -- Send split "stop paste" sequence. feed_data('\027[200~pasted from terminal\027[20') feed_data('1~') @@ -1381,7 +1480,9 @@ describe('TUI', function() end) it('paste: streamed paste with isolated "stop paste" code', function() - child_session:request('nvim_exec_lua', [[ + child_session:request( + 'nvim_exec_lua', + [[ _G.paste_phases = {} vim.paste = (function(overridden) return function(lines, phase) @@ -1389,16 +1490,20 @@ describe('TUI', function() overridden(lines, phase) end end)(vim.paste) - ]], {}) + ]], + {} + ) feed_data('i') - screen:expect{grid=[[ + screen:expect { + grid = [[ {1: } | {4:~ }|*3 {5:[No Name] }| {3:-- INSERT --} | {3:-- TERMINAL --} | - ]]} - feed_data('\027[200~pasted') -- phase 1 + ]], + } + feed_data('\027[200~pasted') -- phase 1 screen:expect([[ pasted{1: } | {4:~ }|*3 @@ -1406,7 +1511,7 @@ describe('TUI', function() {3:-- INSERT --} | {3:-- TERMINAL --} | ]]) - feed_data(' from terminal') -- phase 2 + feed_data(' from terminal') -- phase 2 screen:expect([[ pasted from terminal{1: } | {4:~ }|*3 @@ -1415,25 +1520,25 @@ describe('TUI', function() {3:-- TERMINAL --} | ]]) -- Send isolated "stop paste" sequence. - feed_data('\027[201~') -- phase 3 + feed_data('\027[201~') -- phase 3 screen:expect_unchanged() local _, rv = child_session:request('nvim_exec_lua', [[return _G.paste_phases]], {}) - eq({1, 2, 3}, rv) + eq({ 1, 2, 3 }, rv) end) it('allows termguicolors to be set at runtime', function() screen:set_option('rgb', true) screen:set_default_attr_ids({ - [1] = {reverse = true}, - [2] = {foreground = tonumber('0x4040ff'), fg_indexed=true}, - [3] = {bold = true, reverse = true}, - [4] = {bold = true}, - [5] = {reverse = true, foreground = tonumber('0xe0e000'), fg_indexed=true}, - [6] = {foreground = tonumber('0xe0e000'), fg_indexed=true}, - [7] = {reverse = true, foreground = Screen.colors.SeaGreen4}, - [8] = {foreground = Screen.colors.SeaGreen4}, - [9] = {bold = true, foreground = Screen.colors.Blue1}, - [10] = {foreground = Screen.colors.Blue}, + [1] = { reverse = true }, + [2] = { foreground = tonumber('0x4040ff'), fg_indexed = true }, + [3] = { bold = true, reverse = true }, + [4] = { bold = true }, + [5] = { reverse = true, foreground = tonumber('0xe0e000'), fg_indexed = true }, + [6] = { foreground = tonumber('0xe0e000'), fg_indexed = true }, + [7] = { reverse = true, foreground = Screen.colors.SeaGreen4 }, + [8] = { foreground = Screen.colors.SeaGreen4 }, + [9] = { bold = true, foreground = Screen.colors.Blue1 }, + [10] = { foreground = Screen.colors.Blue }, }) feed_data(':hi SpecialKey ctermfg=3 guifg=SeaGreen\n') @@ -1470,46 +1575,54 @@ describe('TUI', function() it('forwards :term palette colors with termguicolors', function() if is_ci('github') then - pending("tty-test complains about not owning the terminal -- actions/runner#241") + pending('tty-test complains about not owning the terminal -- actions/runner#241') end screen:set_rgb_cterm(true) screen:set_default_attr_ids({ - [1] = {{reverse = true}, {reverse = true}}, - [2] = {{bold = true, reverse = true}, {bold = true, reverse = true}}, - [3] = {{bold = true}, {bold = true}}, - [4] = {{fg_indexed = true, foreground = tonumber('0xe0e000')}, {foreground = 3}}, - [5] = {{foreground = tonumber('0xff8000')}, {}}, + [1] = { { reverse = true }, { reverse = true } }, + [2] = { { bold = true, reverse = true }, { bold = true, reverse = true } }, + [3] = { { bold = true }, { bold = true } }, + [4] = { { fg_indexed = true, foreground = tonumber('0xe0e000') }, { foreground = 3 } }, + [5] = { { foreground = tonumber('0xff8000') }, {} }, }) child_exec_lua('vim.o.statusline="^^^^^^^"') child_exec_lua('vim.o.termguicolors=true') child_exec_lua('vim.cmd.terminal(...)', testprg('tty-test')) - screen:expect{grid=[[ + screen:expect { + grid = [[ {1:t}ty ready | |*3 {2:^^^^^^^ }| | {3:-- TERMINAL --} | - ]]} - feed_data(':call chansend(&channel, "\\033[38;5;3mtext\\033[38:2:255:128:0mcolor\\033[0;10mtext")\n') - screen:expect{grid=[[ + ]], + } + feed_data( + ':call chansend(&channel, "\\033[38;5;3mtext\\033[38:2:255:128:0mcolor\\033[0;10mtext")\n' + ) + screen:expect { + grid = [[ {1:t}ty ready | {4:text}{5:color}text | |*2 {2:^^^^^^^ }| | {3:-- TERMINAL --} | - ]]} + ]], + } feed_data(':set notermguicolors\n') - screen:expect{grid=[[ + screen:expect { + grid = [[ {1:t}ty ready | {4:text}colortext | |*2 {2:^^^^^^^ }| :set notermguicolors | {3:-- TERMINAL --} | - ]]} + ]], + } end) it('in nvim_list_uis()', function() @@ -1535,7 +1648,7 @@ describe('TUI', function() term_background = '', term_colors = 256, term_name = exp_term, - width = 50 + width = 50, }, } local _, rv = child_session:request('nvim_list_uis') @@ -1543,10 +1656,17 @@ describe('TUI', function() end) it('allows grid to assume wider ambiguous-width characters than host terminal #19686', function() - child_session:request('nvim_buf_set_lines', 0, 0, -1, true, { ('℃'):rep(60), ('℃'):rep(60) }) + child_session:request( + 'nvim_buf_set_lines', + 0, + 0, + -1, + true, + { ('℃'):rep(60), ('℃'):rep(60) } + ) child_session:request('nvim_set_option_value', 'cursorline', true, {}) child_session:request('nvim_set_option_value', 'list', true, {}) - child_session:request('nvim_set_option_value', 'listchars', 'eol:$', {win=0}) + child_session:request('nvim_set_option_value', 'listchars', 'eol:$', { win = 0 }) feed_data('gg') local singlewidth_screen = [[ {13:℃}{12:℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃℃}| @@ -1573,9 +1693,9 @@ describe('TUI', function() screen:expect(doublewidth_screen) child_session:request('nvim_set_option_value', 'ambiwidth', 'single', {}) screen:expect(singlewidth_screen) - child_session:request('nvim_call_function', 'setcellwidths', {{{0x2103, 0x2103, 2}}}) + child_session:request('nvim_call_function', 'setcellwidths', { { { 0x2103, 0x2103, 2 } } }) screen:expect(doublewidth_screen) - child_session:request('nvim_call_function', 'setcellwidths', {{{0x2103, 0x2103, 1}}}) + child_session:request('nvim_call_function', 'setcellwidths', { { { 0x2103, 0x2103, 1 } } }) screen:expect(singlewidth_screen) end) @@ -1583,80 +1703,102 @@ describe('TUI', function() helpers.skip(is_os('mac'), 'FIXME: crashes/errors on macOS') screen:try_resize(77, 855) retry(nil, nil, function() - eq({true, 852}, {child_session:request('nvim_win_get_height', 0)}) + eq({ true, 852 }, { child_session:request('nvim_win_get_height', 0) }) end) -- Use full screen message so that redrawing afterwards is more deterministic. child_session:notify('nvim_command', 'intro') - screen:expect({any = 'Nvim'}) + screen:expect({ any = 'Nvim' }) -- Going to top-left corner needs 3 bytes. -- Setting underline attribute needs 9 bytes. -- The whole line needs 3 + 9 + 65513 + 3 = 65528 bytes. -- The cursor_address that comes after will overflow the 65535-byte buffer. local line = ('a'):rep(65513) .. '℃' - child_session:notify('nvim_exec_lua', [[ + child_session:notify( + 'nvim_exec_lua', + [[ vim.api.nvim_buf_set_lines(0, 0, -1, true, {...}) vim.o.cursorline = true - ]], {line, 'b'}) + ]], + { line, 'b' } + ) -- Close the :intro message and redraw the lines. feed_data('\n') screen:expect( - '{13:a}{12:' .. ('a'):rep(76) .. '}|\n' - .. ('{12:' .. ('a'):rep(77) .. '}|\n'):rep(849) - .. '{12:' .. ('a'):rep(63) .. '℃' .. (' '):rep(13) .. '}|\n' .. dedent([[ + '{13:a}{12:' + .. ('a'):rep(76) + .. '}|\n' + .. ('{12:' .. ('a'):rep(77) .. '}|\n'):rep(849) + .. '{12:' + .. ('a'):rep(63) + .. '℃' + .. (' '):rep(13) + .. '}|\n' + .. dedent([[ b | {5:[No Name] [+] }| | - {3:-- TERMINAL --} |]])) + {3:-- TERMINAL --} |]]) + ) end) it('visual bell (padding) does not crash #21610', function() feed_data ':set visualbell\n' - screen:expect{grid=[[ + screen:expect { + grid = [[ {1: } | {4:~ }|*3 {5:[No Name] }| :set visualbell | {3:-- TERMINAL --} | - ]]} + ]], + } -- move left is enough to invoke the bell feed_data 'h' -- visual change to show we process events after this feed_data 'i' - screen:expect{grid=[[ + screen:expect { + grid = [[ {1: } | {4:~ }|*3 {5:[No Name] }| {3:-- INSERT --} | {3:-- TERMINAL --} | - ]]} + ]], + } end) it('no assert failure on deadly signal #21896', function() exec_lua([[vim.uv.kill(vim.fn.jobpid(vim.bo.channel), 'sigterm')]]) - screen:expect{grid=[[ + screen:expect { + grid = [[ Vim: Caught deadly signal 'SIGTERM' | |*2 [Process exited 1]{1: } | |*2 {3:-- TERMINAL --} | - ]]} + ]], + } end) it('no stack-use-after-scope with cursor color #22432', function() screen:set_option('rgb', true) command('set termguicolors') - child_session:request('nvim_exec2', [[ + child_session:request( + 'nvim_exec2', + [[ set tgc hi Cursor guifg=Red guibg=Green set guicursor=n:block-Cursor/lCursor - ]], {}) + ]], + {} + ) screen:set_default_attr_ids({ - [1] = {reverse = true}, - [2] = {bold = true, foreground = Screen.colors.Blue}, - [3] = {foreground = Screen.colors.Blue}, - [4] = {reverse = true, bold = true}, - [5] = {bold = true}, + [1] = { reverse = true }, + [2] = { bold = true, foreground = Screen.colors.Blue }, + [3] = { foreground = Screen.colors.Blue }, + [4] = { reverse = true, bold = true }, + [5] = { bold = true }, }) screen:expect([[ {1: } | @@ -1676,7 +1818,7 @@ describe('TUI', function() end) it('redraws on SIGWINCH even if terminal size is unchanged #23411', function() - child_session:request('nvim_echo', {{'foo'}}, false, {}) + child_session:request('nvim_echo', { { 'foo' } }, false, {}) screen:expect([[ {1: } | {4:~ }|*3 @@ -1695,8 +1837,10 @@ describe('TUI', function() end) it('supports hiding cursor', function() - child_session:request('nvim_command', - "let g:id = jobstart([v:progpath, '--clean', '--headless'])") + child_session:request( + 'nvim_command', + "let g:id = jobstart([v:progpath, '--clean', '--headless'])" + ) feed_data(':call jobwait([g:id])\n') screen:expect([[ | @@ -1752,19 +1896,22 @@ describe('TUI', function() it('resize at startup #17285 #15044 #11330', function() local screen = Screen.new(50, 10) screen:set_default_attr_ids({ - [1] = {reverse = true}, - [2] = {bold = true, foreground = Screen.colors.Blue}, - [3] = {bold = true}, - [4] = {foreground = tonumber('0x4040ff'), fg_indexed = true}, - [5] = {bold = true, reverse = true}, + [1] = { reverse = true }, + [2] = { bold = true, foreground = Screen.colors.Blue }, + [3] = { bold = true }, + [4] = { foreground = tonumber('0x4040ff'), fg_indexed = true }, + [5] = { bold = true, reverse = true }, }) screen:attach() funcs.termopen({ nvim_prog, '--clean', - '--cmd', 'colorscheme vim', - '--cmd', 'set notermguicolors', - '--cmd', 'let start = reltime() | while v:true | if reltimefloat(reltime(start)) > 2 | break | endif | endwhile', + '--cmd', + 'colorscheme vim', + '--cmd', + 'set notermguicolors', + '--cmd', + 'let start = reltime() | while v:true | if reltimefloat(reltime(start)) > 2 | break | endif | endwhile', }, { env = { VIMRUNTIME = os.getenv('VIMRUNTIME'), @@ -1792,24 +1939,30 @@ describe('TUI', function() pending('missing LuaJIT FFI') end local script_file = 'Xargv0.lua' - write_file(script_file, [=[ + write_file( + script_file, + [=[ local ffi = require('ffi') ffi.cdef([[int execl(const char *, const char *, ...);]]) ffi.C.execl(vim.v.progpath, 'Xargv0nvim', '--clean') - ]=]) + ]=] + ) finally(function() os.remove(script_file) end) - local screen = thelpers.setup_child_nvim({'--clean', '-l', script_file}) - screen:expect{grid=[[ + local screen = thelpers.setup_child_nvim({ '--clean', '-l', script_file }) + screen:expect { + grid = [[ {1: } | ~ |*3 [No Name] 0,0-1 All| | {3:-- TERMINAL --} | - ]]} + ]], + } feed_data(':put =v:argv + [v:progname]\n') - screen:expect{grid=[[ + screen:expect { + grid = [[ Xargv0nvim | --embed | --clean | @@ -1817,16 +1970,22 @@ describe('TUI', function() [No Name] [+] 5,1 Bot| 4 more lines | {3:-- TERMINAL --} | - ]]} + ]], + } end) it('with non-tty (pipe) stdout/stderr', function() finally(function() os.remove('testF') end) - local screen = thelpers.screen_setup(0, - ('"%s" -u NONE -i NONE --cmd "set noswapfile noshowcmd noruler" --cmd "normal iabc" > /dev/null 2>&1 && cat testF && rm testF'):format(nvim_prog), - nil, { VIMRUNTIME = os.getenv('VIMRUNTIME') }) + local screen = thelpers.screen_setup( + 0, + ('"%s" -u NONE -i NONE --cmd "set noswapfile noshowcmd noruler" --cmd "normal iabc" > /dev/null 2>&1 && cat testF && rm testF'):format( + nvim_prog + ), + nil, + { VIMRUNTIME = os.getenv('VIMRUNTIME') } + ) feed_data(':w testF\n:q\n') screen:expect([[ :w testF | @@ -1841,19 +2000,26 @@ describe('TUI', function() it('<C-h> #10134', function() local screen = thelpers.setup_child_nvim({ - '-u', 'NONE', - '-i', 'NONE', - '--cmd', 'colorscheme vim', - '--cmd', 'set noruler notermguicolors', - '--cmd', ':nnoremap <C-h> :echomsg "\\<C-h\\>"<CR>', + '-u', + 'NONE', + '-i', + 'NONE', + '--cmd', + 'colorscheme vim', + '--cmd', + 'set noruler notermguicolors', + '--cmd', + ':nnoremap <C-h> :echomsg "\\<C-h\\>"<CR>', }) - screen:expect{grid=[[ + screen:expect { + grid = [[ {1: } | {4:~ }|*3 {5:[No Name] }| | {3:-- TERMINAL --} | - ]]} + ]], + } command([[call chansend(b:terminal_job_id, "\<C-h>")]]) screen:expect([[ @@ -1867,22 +2033,30 @@ describe('TUI', function() it('draws line with many trailing spaces correctly #24955', function() local screen = thelpers.setup_child_nvim({ - '-u', 'NONE', - '-i', 'NONE', - '--cmd', 'set notermguicolors', - '--cmd', 'colorscheme vim', - '--cmd', 'call setline(1, ["1st line" .. repeat(" ", 153), "2nd line"])', + '-u', + 'NONE', + '-i', + 'NONE', + '--cmd', + 'set notermguicolors', + '--cmd', + 'colorscheme vim', + '--cmd', + 'call setline(1, ["1st line" .. repeat(" ", 153), "2nd line"])', }, { cols = 80 }) - screen:expect{grid=[[ + screen:expect { + grid = [[ {1:1}st line | |*2 2nd line | {5:[No Name] [+] 1,1 All}| | {3:-- TERMINAL --} | - ]]} + ]], + } feed_data('$') - screen:expect{grid=[[ + screen:expect { + grid = [[ 1st line | | {1: } | @@ -1890,7 +2064,8 @@ describe('TUI', function() {5:[No Name] [+] 1,161 All}| | {3:-- TERMINAL --} | - ]]} + ]], + } end) end) @@ -1898,30 +2073,42 @@ describe('TUI UIEnter/UILeave', function() it('fires exactly once, after VimEnter', function() clear() local screen = thelpers.setup_child_nvim({ - '-u', 'NONE', - '-i', 'NONE', - '--cmd', 'colorscheme vim', - '--cmd', 'set noswapfile noshowcmd noruler notermguicolors', - '--cmd', 'let g:evs = []', - '--cmd', 'autocmd UIEnter * :call add(g:evs, "UIEnter")', - '--cmd', 'autocmd UILeave * :call add(g:evs, "UILeave")', - '--cmd', 'autocmd VimEnter * :call add(g:evs, "VimEnter")', + '-u', + 'NONE', + '-i', + 'NONE', + '--cmd', + 'colorscheme vim', + '--cmd', + 'set noswapfile noshowcmd noruler notermguicolors', + '--cmd', + 'let g:evs = []', + '--cmd', + 'autocmd UIEnter * :call add(g:evs, "UIEnter")', + '--cmd', + 'autocmd UILeave * :call add(g:evs, "UILeave")', + '--cmd', + 'autocmd VimEnter * :call add(g:evs, "VimEnter")', }) - screen:expect{grid=[[ + screen:expect { + grid = [[ {1: } | {4:~ }|*3 {5:[No Name] }| | {3:-- TERMINAL --} | - ]]} - feed_data(":echo g:evs\n") - screen:expect{grid=[[ + ]], + } + feed_data(':echo g:evs\n') + screen:expect { + grid = [[ {1: } | {4:~ }|*3 {5:[No Name] }| ['VimEnter', 'UIEnter'] | {3:-- TERMINAL --} | - ]]} + ]], + } end) end) @@ -1933,11 +2120,16 @@ describe('TUI FocusGained/FocusLost', function() clear() local child_server = new_pipename() screen = thelpers.setup_child_nvim({ - '--listen', child_server, - '-u', 'NONE', - '-i', 'NONE', - '--cmd', 'colorscheme vim', - '--cmd', 'set noswapfile noshowcmd noruler notermguicolors', + '--listen', + child_server, + '-u', + 'NONE', + '-i', + 'NONE', + '--cmd', + 'colorscheme vim', + '--cmd', + 'set noswapfile noshowcmd noruler notermguicolors', }) screen:expect([[ @@ -1948,11 +2140,15 @@ describe('TUI FocusGained/FocusLost', function() {3:-- TERMINAL --} | ]]) child_session = helpers.connect(child_server) - child_session:request('nvim_exec2', [[ + child_session:request( + 'nvim_exec2', + [[ autocmd FocusGained * echo 'gained' autocmd FocusLost * echo 'lost' - ]], {}) - feed_data("\034\016") -- CTRL-\ CTRL-N + ]], + {} + ) + feed_data('\034\016') -- CTRL-\ CTRL-N end) it('in normal-mode', function() @@ -1980,13 +2176,15 @@ describe('TUI FocusGained/FocusLost', function() it('in insert-mode', function() feed_data(':set noshowmode\r') feed_data('i') - screen:expect{grid=[[ + screen:expect { + grid = [[ {1: } | {4:~ }|*3 {5:[No Name] }| :set noshowmode | {3:-- TERMINAL --} | - ]]} + ]], + } retry(2, 3 * screen.timeout, function() feed_data('\027[I') screen:expect([[ @@ -2020,24 +2218,31 @@ describe('TUI FocusGained/FocusLost', function() {3:-- TERMINAL --} | ]]) feed_data('\027[O') - screen:expect{grid=[[ + screen:expect { + grid = [[ | {4:~ }|*3 {5:[No Name] }| :{1: } | {3:-- TERMINAL --} | - ]], unchanged=true} + ]], + unchanged = true, + } end) it('in cmdline-mode', function() -- Set up autocmds that modify the buffer, instead of just calling :echo. -- This is how we can test handling of focus gained/lost during cmdline-mode. -- See commit: 5cc87d4dabd02167117be7a978b5c8faaa975419. - child_session:request('nvim_exec2', [[ + child_session:request( + 'nvim_exec2', + [[ autocmd! autocmd FocusLost * call append(line('$'), 'lost') autocmd FocusGained * call append(line('$'), 'gained') - ]], {}) + ]], + {} + ) retry(2, 3 * screen.timeout, function() -- Enter cmdline-mode. feed_data(':') @@ -2049,34 +2254,39 @@ describe('TUI FocusGained/FocusLost', function() -- Exit cmdline-mode. Redraws from timers/events are blocked during -- cmdline-mode, so the buffer won't be updated until we exit cmdline-mode. feed_data('\n') - screen:expect{any='lost'..(' '):rep(46)..'|\ngained'} + screen:expect { any = 'lost' .. (' '):rep(46) .. '|\ngained' } end) end) it('in terminal-mode', function() - feed_data(':set shell='..testprg('shell-test')..' shellcmdflag=EXE\n') + feed_data(':set shell=' .. testprg('shell-test') .. ' shellcmdflag=EXE\n') feed_data(':set noshowmode laststatus=0\n') feed_data(':terminal zia\n') -- Wait for terminal to be ready. - screen:expect{grid=[[ + screen:expect { + grid = [[ {1:r}eady $ zia | | [Process exited 0] | |*2 :terminal zia | {3:-- TERMINAL --} | - ]]} + ]], + } feed_data('\027[I') - screen:expect{grid=[[ + screen:expect { + grid = [[ {1:r}eady $ zia | | [Process exited 0] | |*2 gained | {3:-- TERMINAL --} | - ]], timeout=(4 * screen.timeout)} + ]], + timeout = (4 * screen.timeout), + } feed_data('\027[O') screen:expect([[ @@ -2092,8 +2302,9 @@ describe('TUI FocusGained/FocusLost', function() it('in press-enter prompt', function() feed_data(":echom 'msg1'|echom 'msg2'|echom 'msg3'|echom 'msg4'|echom 'msg5'\n") -- Execute :messages to provoke the press-enter prompt. - feed_data(":messages\n") - screen:expect{grid=[[ + feed_data(':messages\n') + screen:expect { + grid = [[ msg1 | msg2 | msg3 | @@ -2101,10 +2312,12 @@ describe('TUI FocusGained/FocusLost', function() msg5 | {10:Press ENTER or type command to continue}{1: } | {3:-- TERMINAL --} | - ]]} + ]], + } feed_data('\027[I') feed_data('\027[I') - screen:expect{grid=[[ + screen:expect { + grid = [[ msg1 | msg2 | msg3 | @@ -2112,7 +2325,9 @@ describe('TUI FocusGained/FocusLost', function() msg5 | {10:Press ENTER or type command to continue}{1: } | {3:-- TERMINAL --} | - ]], unchanged=true} + ]], + unchanged = true, + } end) end) @@ -2122,12 +2337,16 @@ describe("TUI 't_Co' (terminal colors)", function() local screen local function assert_term_colors(term, colorterm, maxcolors) - clear({env={TERM=term}, args={}}) + clear({ env = { TERM = term }, args = {} }) screen = thelpers.setup_child_nvim({ - '-u', 'NONE', - '-i', 'NONE', - '--cmd', 'colorscheme vim', - '--cmd', nvim_set .. ' notermguicolors', + '-u', + 'NONE', + '-i', + 'NONE', + '--cmd', + 'colorscheme vim', + '--cmd', + nvim_set .. ' notermguicolors', }, { env = { LANG = 'C', @@ -2138,81 +2357,88 @@ describe("TUI 't_Co' (terminal colors)", function() local tline if maxcolors == 8 then - tline = "{9:~ }" + tline = '{9:~ }' elseif maxcolors == 16 then - tline = "~ " + tline = '~ ' else - tline = "{4:~ }" + tline = '{4:~ }' end - screen:expect(string.format([[ + screen:expect(string.format( + [[ {1: } | %s|*4 | {3:-- TERMINAL --} | - ]], tline)) + ]], + tline + )) - feed_data(":echo &t_Co\n") - screen:expect(string.format([[ + feed_data(':echo &t_Co\n') + screen:expect(string.format( + [[ {1: } | %s|*4 %-3s | {3:-- TERMINAL --} | - ]], tline, tostring(maxcolors and maxcolors or ""))) + ]], + tline, + tostring(maxcolors and maxcolors or '') + )) end -- ansi and no terminal type at all: - it("no TERM uses 8 colors", function() + it('no TERM uses 8 colors', function() assert_term_colors(nil, nil, 8) end) - it("TERM=ansi no COLORTERM uses 8 colors", function() - assert_term_colors("ansi", nil, 8) + it('TERM=ansi no COLORTERM uses 8 colors', function() + assert_term_colors('ansi', nil, 8) end) - it("TERM=ansi with COLORTERM=anything-no-number uses 16 colors", function() - assert_term_colors("ansi", "yet-another-term", 16) + it('TERM=ansi with COLORTERM=anything-no-number uses 16 colors', function() + assert_term_colors('ansi', 'yet-another-term', 16) end) - it("unknown TERM COLORTERM with 256 in name uses 256 colors", function() - assert_term_colors("ansi", "yet-another-term-256color", 256) + it('unknown TERM COLORTERM with 256 in name uses 256 colors', function() + assert_term_colors('ansi', 'yet-another-term-256color', 256) end) - it("TERM=ansi-256color sets 256 colours", function() - assert_term_colors("ansi-256color", nil, 256) + it('TERM=ansi-256color sets 256 colours', function() + assert_term_colors('ansi-256color', nil, 256) end) -- Unknown terminal types: - it("unknown TERM no COLORTERM sets 8 colours", function() - assert_term_colors("yet-another-term", nil, 8) + it('unknown TERM no COLORTERM sets 8 colours', function() + assert_term_colors('yet-another-term', nil, 8) end) - it("unknown TERM with COLORTERM=anything-no-number uses 16 colors", function() - assert_term_colors("yet-another-term", "yet-another-term", 16) + it('unknown TERM with COLORTERM=anything-no-number uses 16 colors', function() + assert_term_colors('yet-another-term', 'yet-another-term', 16) end) - it("unknown TERM with 256 in name sets 256 colours", function() - assert_term_colors("yet-another-term-256color", nil, 256) + it('unknown TERM with 256 in name sets 256 colours', function() + assert_term_colors('yet-another-term-256color', nil, 256) end) - it("unknown TERM COLORTERM with 256 in name uses 256 colors", function() - assert_term_colors("yet-another-term", "yet-another-term-256color", 256) + it('unknown TERM COLORTERM with 256 in name uses 256 colors', function() + assert_term_colors('yet-another-term', 'yet-another-term-256color', 256) end) -- Linux kernel terminal emulator: - it("TERM=linux uses 256 colors", function() - assert_term_colors("linux", nil, 256) + it('TERM=linux uses 256 colors', function() + assert_term_colors('linux', nil, 256) end) - it("TERM=linux-16color uses 256 colors", function() - assert_term_colors("linux-16color", nil, 256) + it('TERM=linux-16color uses 256 colors', function() + assert_term_colors('linux-16color', nil, 256) end) - it("TERM=linux-256color uses 256 colors", function() - assert_term_colors("linux-256color", nil, 256) + it('TERM=linux-256color uses 256 colors', function() + assert_term_colors('linux-256color', nil, 256) end) -- screen: @@ -2221,28 +2447,28 @@ describe("TUI 't_Co' (terminal colors)", function() -- Linux and MacOS have a screen entry in external terminfo with 8 colours, -- which is raised to 16 by COLORTERM. - it("TERM=screen no COLORTERM uses 8/256 colors", function() + it('TERM=screen no COLORTERM uses 8/256 colors', function() if is_os('freebsd') then - assert_term_colors("screen", nil, 256) + assert_term_colors('screen', nil, 256) else - assert_term_colors("screen", nil, 8) + assert_term_colors('screen', nil, 8) end end) - it("TERM=screen COLORTERM=screen uses 16/256 colors", function() + it('TERM=screen COLORTERM=screen uses 16/256 colors', function() if is_os('freebsd') then - assert_term_colors("screen", "screen", 256) + assert_term_colors('screen', 'screen', 256) else - assert_term_colors("screen", "screen", 16) + assert_term_colors('screen', 'screen', 16) end end) - it("TERM=screen COLORTERM=screen-256color uses 256 colors", function() - assert_term_colors("screen", "screen-256color", 256) + it('TERM=screen COLORTERM=screen-256color uses 256 colors', function() + assert_term_colors('screen', 'screen-256color', 256) end) - it("TERM=screen-256color no COLORTERM uses 256 colors", function() - assert_term_colors("screen-256color", nil, 256) + it('TERM=screen-256color no COLORTERM uses 256 colors', function() + assert_term_colors('screen-256color', nil, 256) end) -- tmux: @@ -2251,38 +2477,38 @@ describe("TUI 't_Co' (terminal colors)", function() -- Linux has a tmux entry in external terminfo with 8 colours, -- which is raised to 256. - it("TERM=tmux no COLORTERM uses 256 colors", function() - assert_term_colors("tmux", nil, 256) + it('TERM=tmux no COLORTERM uses 256 colors', function() + assert_term_colors('tmux', nil, 256) end) - it("TERM=tmux COLORTERM=tmux uses 256 colors", function() - assert_term_colors("tmux", "tmux", 256) + it('TERM=tmux COLORTERM=tmux uses 256 colors', function() + assert_term_colors('tmux', 'tmux', 256) end) - it("TERM=tmux COLORTERM=tmux-256color uses 256 colors", function() - assert_term_colors("tmux", "tmux-256color", 256) + it('TERM=tmux COLORTERM=tmux-256color uses 256 colors', function() + assert_term_colors('tmux', 'tmux-256color', 256) end) - it("TERM=tmux-256color no COLORTERM uses 256 colors", function() - assert_term_colors("tmux-256color", nil, 256) + it('TERM=tmux-256color no COLORTERM uses 256 colors', function() + assert_term_colors('tmux-256color', nil, 256) end) -- xterm and imitators: - it("TERM=xterm uses 256 colors", function() - assert_term_colors("xterm", nil, 256) + it('TERM=xterm uses 256 colors', function() + assert_term_colors('xterm', nil, 256) end) - it("TERM=xterm COLORTERM=gnome-terminal uses 256 colors", function() - assert_term_colors("xterm", "gnome-terminal", 256) + it('TERM=xterm COLORTERM=gnome-terminal uses 256 colors', function() + assert_term_colors('xterm', 'gnome-terminal', 256) end) - it("TERM=xterm COLORTERM=mate-terminal uses 256 colors", function() - assert_term_colors("xterm", "mate-terminal", 256) + it('TERM=xterm COLORTERM=mate-terminal uses 256 colors', function() + assert_term_colors('xterm', 'mate-terminal', 256) end) - it("TERM=xterm-256color uses 256 colors", function() - assert_term_colors("xterm-256color", nil, 256) + it('TERM=xterm-256color uses 256 colors', function() + assert_term_colors('xterm-256color', nil, 256) end) -- rxvt and stterm: @@ -2292,44 +2518,44 @@ describe("TUI 't_Co' (terminal colors)", function() -- Linux has an rxvt, an st, and an st-16color entry in external terminfo -- with 8, 8, and 16 colours respectively, which are raised to 256. - it("TERM=rxvt no COLORTERM uses 256 colors", function() - assert_term_colors("rxvt", nil, 256) + it('TERM=rxvt no COLORTERM uses 256 colors', function() + assert_term_colors('rxvt', nil, 256) end) - it("TERM=rxvt COLORTERM=rxvt uses 256 colors", function() - assert_term_colors("rxvt", "rxvt", 256) + it('TERM=rxvt COLORTERM=rxvt uses 256 colors', function() + assert_term_colors('rxvt', 'rxvt', 256) end) - it("TERM=rxvt-256color uses 256 colors", function() - assert_term_colors("rxvt-256color", nil, 256) + it('TERM=rxvt-256color uses 256 colors', function() + assert_term_colors('rxvt-256color', nil, 256) end) - it("TERM=st no COLORTERM uses 256 colors", function() - assert_term_colors("st", nil, 256) + it('TERM=st no COLORTERM uses 256 colors', function() + assert_term_colors('st', nil, 256) end) - it("TERM=st COLORTERM=st uses 256 colors", function() - assert_term_colors("st", "st", 256) + it('TERM=st COLORTERM=st uses 256 colors', function() + assert_term_colors('st', 'st', 256) end) - it("TERM=st COLORTERM=st-256color uses 256 colors", function() - assert_term_colors("st", "st-256color", 256) + it('TERM=st COLORTERM=st-256color uses 256 colors', function() + assert_term_colors('st', 'st-256color', 256) end) - it("TERM=st-16color no COLORTERM uses 8/256 colors", function() - assert_term_colors("st", nil, 256) + it('TERM=st-16color no COLORTERM uses 8/256 colors', function() + assert_term_colors('st', nil, 256) end) - it("TERM=st-16color COLORTERM=st uses 16/256 colors", function() - assert_term_colors("st", "st", 256) + it('TERM=st-16color COLORTERM=st uses 16/256 colors', function() + assert_term_colors('st', 'st', 256) end) - it("TERM=st-16color COLORTERM=st-256color uses 256 colors", function() - assert_term_colors("st", "st-256color", 256) + it('TERM=st-16color COLORTERM=st-256color uses 256 colors', function() + assert_term_colors('st', 'st-256color', 256) end) - it("TERM=st-256color uses 256 colors", function() - assert_term_colors("st-256color", nil, 256) + it('TERM=st-256color uses 256 colors', function() + assert_term_colors('st-256color', nil, 256) end) -- gnome and vte: @@ -2339,54 +2565,53 @@ describe("TUI 't_Co' (terminal colors)", function() -- external terminfo with 8, 8, 256, and 256 colours respectively, which are -- raised to 256. - it("TERM=gnome no COLORTERM uses 256 colors", function() - assert_term_colors("gnome", nil, 256) + it('TERM=gnome no COLORTERM uses 256 colors', function() + assert_term_colors('gnome', nil, 256) end) - it("TERM=gnome COLORTERM=gnome uses 256 colors", function() - assert_term_colors("gnome", "gnome", 256) + it('TERM=gnome COLORTERM=gnome uses 256 colors', function() + assert_term_colors('gnome', 'gnome', 256) end) - it("TERM=gnome COLORTERM=gnome-256color uses 256 colors", function() - assert_term_colors("gnome", "gnome-256color", 256) + it('TERM=gnome COLORTERM=gnome-256color uses 256 colors', function() + assert_term_colors('gnome', 'gnome-256color', 256) end) - it("TERM=gnome-256color uses 256 colors", function() - assert_term_colors("gnome-256color", nil, 256) + it('TERM=gnome-256color uses 256 colors', function() + assert_term_colors('gnome-256color', nil, 256) end) - it("TERM=vte no COLORTERM uses 256 colors", function() - assert_term_colors("vte", nil, 256) + it('TERM=vte no COLORTERM uses 256 colors', function() + assert_term_colors('vte', nil, 256) end) - it("TERM=vte COLORTERM=vte uses 256 colors", function() - assert_term_colors("vte", "vte", 256) + it('TERM=vte COLORTERM=vte uses 256 colors', function() + assert_term_colors('vte', 'vte', 256) end) - it("TERM=vte COLORTERM=vte-256color uses 256 colors", function() - assert_term_colors("vte", "vte-256color", 256) + it('TERM=vte COLORTERM=vte-256color uses 256 colors', function() + assert_term_colors('vte', 'vte-256color', 256) end) - it("TERM=vte-256color uses 256 colors", function() - assert_term_colors("vte-256color", nil, 256) + it('TERM=vte-256color uses 256 colors', function() + assert_term_colors('vte-256color', nil, 256) end) -- others: -- TODO(blueyed): this is made pending, since it causes failure + later hang -- when using non-compatible libvterm (#9494/#10179). - pending("TERM=interix uses 8 colors", function() - assert_term_colors("interix", nil, 8) + pending('TERM=interix uses 8 colors', function() + assert_term_colors('interix', nil, 8) end) - it("TERM=iTerm.app uses 256 colors", function() - assert_term_colors("iTerm.app", nil, 256) + it('TERM=iTerm.app uses 256 colors', function() + assert_term_colors('iTerm.app', nil, 256) end) - it("TERM=iterm uses 256 colors", function() - assert_term_colors("iterm", nil, 256) + it('TERM=iterm uses 256 colors', function() + assert_term_colors('iterm', nil, 256) end) - end) -- These tests require `thelpers` because --headless/--embed @@ -2397,9 +2622,12 @@ describe("TUI 'term' option", function() local function assert_term(term_envvar, term_expected) clear() screen = thelpers.setup_child_nvim({ - '-u', 'NONE', - '-i', 'NONE', - '--cmd', nvim_set .. ' notermguicolors', + '-u', + 'NONE', + '-i', + 'NONE', + '--cmd', + nvim_set .. ' notermguicolors', }, { env = { LANG = 'C', @@ -2408,29 +2636,29 @@ describe("TUI 'term' option", function() }) local full_timeout = screen.timeout - screen.timeout = 250 -- We want screen:expect() to fail quickly. - retry(nil, 2 * full_timeout, function() -- Wait for TUI thread to set 'term'. + screen.timeout = 250 -- We want screen:expect() to fail quickly. + retry(nil, 2 * full_timeout, function() -- Wait for TUI thread to set 'term'. feed_data(":echo 'term='.(&term)\n") - screen:expect{any='term='..term_expected} + screen:expect { any = 'term=' .. term_expected } end) end it('gets builtin term if $TERM is invalid', function() - assert_term("foo", "builtin_ansi") + assert_term('foo', 'builtin_ansi') end) it('gets system-provided term if $TERM is valid', function() if is_os('openbsd') then - assert_term("xterm", "xterm") - elseif is_os('bsd') then -- BSD lacks terminfo, builtin is always used. - assert_term("xterm", "builtin_xterm") + assert_term('xterm', 'xterm') + elseif is_os('bsd') then -- BSD lacks terminfo, builtin is always used. + assert_term('xterm', 'builtin_xterm') elseif is_os('mac') then - local status, _ = pcall(assert_term, "xterm", "xterm") + local status, _ = pcall(assert_term, 'xterm', 'xterm') if not status then - pending("macOS: unibilium could not find terminfo") + pending('macOS: unibilium could not find terminfo') end else - assert_term("xterm", "xterm") + assert_term('xterm', 'xterm') end end) @@ -2440,12 +2668,11 @@ describe("TUI 'term' option", function() assert_term('conemu', 'builtin_conemu') assert_term('vtpcon', 'builtin_vtpcon') end) - end) -- These tests require `thelpers` because --headless/--embed -- does not initialize the TUI. -describe("TUI", function() +describe('TUI', function() local screen local logfile = 'Xtest_tui_verbose_log' after_each(function() @@ -2456,10 +2683,14 @@ describe("TUI", function() local function nvim_tui(extra_args) clear() screen = thelpers.setup_child_nvim({ - '-u', 'NONE', - '-i', 'NONE', - '--cmd', 'colorscheme vim', - '--cmd', nvim_set .. ' notermguicolors', + '-u', + 'NONE', + '-i', + 'NONE', + '--cmd', + 'colorscheme vim', + '--cmd', + nvim_set .. ' notermguicolors', extra_args, }, { env = { @@ -2469,7 +2700,7 @@ describe("TUI", function() end it('-V3log logs terminfo values', function() - nvim_tui('-V3'..logfile) + nvim_tui('-V3' .. logfile) -- Wait for TUI to start. feed_data('Gitext') @@ -2480,7 +2711,7 @@ describe("TUI", function() {3:-- TERMINAL --} | ]]) - retry(nil, 3000, function() -- Wait for log file to be flushed. + retry(nil, 3000, function() -- Wait for log file to be flushed. local log = read_file('Xtest_tui_verbose_log') or '' eq('--- Terminal info --- {{{\n', string.match(log, '%-%-%- Terminal.-\n')) -- }}} ok(#log > 50) @@ -2499,12 +2730,15 @@ describe("TUI", function() feed_data(string.format('\027]52;c;%s\027\\', string.rep('A', 8192))) - screen:expect{grid=[[ + screen:expect { + grid = [[ {1: } | {4:~ }|*4 | {3:-- TERMINAL --} | - ]], unchanged=true} + ]], + unchanged = true, + } end) end) @@ -2538,10 +2772,10 @@ describe('TUI bg color', function() {3:-- TERMINAL --} | ]]) feed_data('\027]11;rgb:ffff/ffff/ffff\027\\') - screen:expect{any='did OptionSet, yay!'} + screen:expect { any = 'did OptionSet, yay!' } feed_data(':echo "new_bg=".&background\n') - screen:expect{any='new_bg=light'} + screen:expect { any = 'new_bg=light' } setup_bg_test() screen:expect([[ @@ -2552,10 +2786,10 @@ describe('TUI bg color', function() {3:-- TERMINAL --} | ]]) feed_data('\027]11;rgba:ffff/ffff/ffff/8000\027\\') - screen:expect{any='did OptionSet, yay!'} + screen:expect { any = 'did OptionSet, yay!' } feed_data(':echo "new_bg=".&background\n') - screen:expect{any='new_bg=light'} + screen:expect { any = 'new_bg=light' } end) it('triggers OptionSet event with split terminal-response', function() @@ -2569,10 +2803,10 @@ describe('TUI bg color', function() -- Send a background response with the OSC command part split. feed_data('\027]11;rgb') feed_data(':ffff/ffff/ffff\027\\') - screen:expect{any='did OptionSet, yay!'} + screen:expect { any = 'did OptionSet, yay!' } feed_data(':echo "new_bg=".&background\n') - screen:expect{any='new_bg=light'} + screen:expect { any = 'new_bg=light' } setup_bg_test() screen:expect([[ @@ -2585,10 +2819,10 @@ describe('TUI bg color', function() -- Send a background response with the Pt portion split. feed_data('\027]11;rgba:ffff/fff') feed_data('f/ffff/8000\027\\') - screen:expect{any='did OptionSet, yay!'} + screen:expect { any = 'did OptionSet, yay!' } feed_data(':echo "new_bg=".&background\n') - screen:expect{any='new_bg=light'} + screen:expect { any = 'new_bg=light' } end) it('not triggers OptionSet event with invalid terminal-response', function() @@ -2603,7 +2837,7 @@ describe('TUI bg color', function() screen:expect_unchanged() feed_data(':echo "new_bg=".&background\n') - screen:expect{any='new_bg=dark'} + screen:expect { any = 'new_bg=dark' } setup_bg_test() screen:expect([[ @@ -2617,76 +2851,89 @@ describe('TUI bg color', function() screen:expect_unchanged() feed_data(':echo "new_bg=".&background\n') - screen:expect{any='new_bg=dark'} + screen:expect { any = 'new_bg=dark' } end) end) -- These tests require `thelpers` because --headless/--embed -- does not initialize the TUI. -describe("TUI as a client", function() - - it("connects to remote instance (with its own TUI)", function() +describe('TUI as a client', function() + it('connects to remote instance (with its own TUI)', function() local server_super = spawn_argv(false) -- equivalent to clear() local client_super = spawn_argv(true) set_session(server_super) local server_pipe = new_pipename() local screen_server = thelpers.setup_child_nvim({ - '--listen', server_pipe, - '-u', 'NONE', - '-i', 'NONE', - '--cmd', 'colorscheme vim', - '--cmd', nvim_set .. ' notermguicolors laststatus=2 background=dark', + '--listen', + server_pipe, + '-u', + 'NONE', + '-i', + 'NONE', + '--cmd', + 'colorscheme vim', + '--cmd', + nvim_set .. ' notermguicolors laststatus=2 background=dark', }) - feed_data("iHello, World") - screen_server:expect{grid=[[ + feed_data('iHello, World') + screen_server:expect { + grid = [[ Hello, World{1: } | {4:~ }|*3 {5:[No Name] [+] }| {3:-- INSERT --} | {3:-- TERMINAL --} | - ]]} - feed_data("\027") - screen_server:expect{grid=[[ + ]], + } + feed_data('\027') + screen_server:expect { + grid = [[ Hello, Worl{1:d} | {4:~ }|*3 {5:[No Name] [+] }| | {3:-- TERMINAL --} | - ]]} + ]], + } set_session(client_super) local screen_client = thelpers.setup_child_nvim({ - '--server', server_pipe, + '--server', + server_pipe, '--remote-ui', }) - screen_client:expect{grid=[[ + screen_client:expect { + grid = [[ Hello, Worl{1:d} | {4:~ }|*3 {5:[No Name] [+] }| | {3:-- TERMINAL --} | - ]]} + ]], + } -- grid smaller than containing terminal window is cleared properly feed_data(":call setline(1,['a'->repeat(&columns)]->repeat(&lines))\n") - feed_data("0:set lines=3\n") - screen_server:expect{grid=[[ + feed_data('0:set lines=3\n') + screen_server:expect { + grid = [[ {1:a}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa| {5:[No Name] [+] }| |*4 {3:-- TERMINAL --} | - ]]} + ]], + } - feed_data(":q!\n") + feed_data(':q!\n') server_super:close() client_super:close() end) - it("connects to remote instance (--headless)", function() + it('connects to remote instance (--headless)', function() local server = spawn_argv(false) -- equivalent to clear() local client_super = spawn_argv(true) @@ -2697,41 +2944,47 @@ describe("TUI as a client", function() set_session(client_super) local screen_client = thelpers.setup_child_nvim({ - '--server', server_pipe, + '--server', + server_pipe, '--remote-ui', }) - screen_client:expect{grid=[[ + screen_client:expect { + grid = [[ Halloj{1:!} | {4:~ }|*4 | {3:-- TERMINAL --} | - ]]} + ]], + } -- No heap-use-after-free when receiving UI events after deadly signal #22184 server:request('nvim_input', ('a'):rep(1000)) exec_lua([[vim.uv.kill(vim.fn.jobpid(vim.bo.channel), 'sigterm')]]) - screen_client:expect{grid=[[ + screen_client:expect { + grid = [[ Vim: Caught deadly signal 'SIGTERM' | |*2 [Process exited 1]{1: } | |*2 {3:-- TERMINAL --} | - ]]} + ]], + } eq(0, meths.get_vvar('shell_error')) -- exits on input eof #22244 - funcs.system({nvim_prog, '--server', server_pipe, '--remote-ui'}) + funcs.system({ nvim_prog, '--server', server_pipe, '--remote-ui' }) eq(1, meths.get_vvar('shell_error')) client_super:close() server:close() end) - it("throws error when no server exists", function() + it('throws error when no server exists', function() clear() local screen = thelpers.setup_child_nvim({ - '--server', '127.0.0.1:2436546', + '--server', + '127.0.0.1:2436546', '--remote-ui', }, { cols = 60 }) @@ -2751,79 +3004,97 @@ describe("TUI as a client", function() set_session(server_super) local server_pipe = new_pipename() local screen_server = thelpers.setup_child_nvim({ - '--listen', server_pipe, - '-u', 'NONE', - '-i', 'NONE', - '--cmd', 'colorscheme vim', - '--cmd', nvim_set .. ' notermguicolors laststatus=2 background=dark', + '--listen', + server_pipe, + '-u', + 'NONE', + '-i', + 'NONE', + '--cmd', + 'colorscheme vim', + '--cmd', + nvim_set .. ' notermguicolors laststatus=2 background=dark', }) - screen_server:expect{grid=[[ + screen_server:expect { + grid = [[ {1: } | {4:~ }|*3 {5:[No Name] }| | {3:-- TERMINAL --} | - ]]} + ]], + } - feed_data("iHello, World") - screen_server:expect{grid=[[ + feed_data('iHello, World') + screen_server:expect { + grid = [[ Hello, World{1: } | {4:~ }|*3 {5:[No Name] [+] }| {3:-- INSERT --} | {3:-- TERMINAL --} | - ]]} - feed_data("\027") - screen_server:expect{grid=[[ + ]], + } + feed_data('\027') + screen_server:expect { + grid = [[ Hello, Worl{1:d} | {4:~ }|*3 {5:[No Name] [+] }| | {3:-- TERMINAL --} | - ]]} + ]], + } set_session(client_super) local screen_client = thelpers.setup_child_nvim({ - '--server', server_pipe, + '--server', + server_pipe, '--remote-ui', }) - screen_client:expect{grid=[[ + screen_client:expect { + grid = [[ Hello, Worl{1:d} | {4:~ }|*3 {5:[No Name] [+] }| | {3:-- TERMINAL --} | - ]]} + ]], + } -- quitting the server set_session(server_super) - feed_data(status and ':' .. status .. 'cquit!\n' or ":quit!\n") + feed_data(status and ':' .. status .. 'cquit!\n' or ':quit!\n') status = status and status or 0 - screen_server:expect{grid=[[ + screen_server:expect { + grid = [[ | [Process exited ]] .. status .. [[]{1: }{MATCH:%s+}| |*4 {3:-- TERMINAL --} | - ]]} + ]], + } -- assert that client has exited - screen_client:expect{grid=[[ + screen_client:expect { + grid = [[ | [Process exited ]] .. status .. [[]{1: }{MATCH:%s+}| |*4 {3:-- TERMINAL --} | - ]]} + ]], + } server_super:close() client_super:close() end - describe("exits when server quits", function() - it("with :quit", function() + describe('exits when server quits', function() + it('with :quit', function() test_remote_tui_quit() end) - it("with :cquit", function() + it('with :cquit', function() test_remote_tui_quit(42) end) end) |