mirror of
https://github.com/neovim/neovim.git
synced 2024-12-29 14:41:06 -07:00
Merge #10995 'paste: fix paste in terminal mode'
This commit is contained in:
commit
c8223e1618
@ -193,7 +193,7 @@ paste = (function()
|
|||||||
vim.api.nvim_input(line1)
|
vim.api.nvim_input(line1)
|
||||||
vim.api.nvim_set_option('paste', false)
|
vim.api.nvim_set_option('paste', false)
|
||||||
elseif mode ~= 'c' then -- Else: discard remaining cmdline-mode chunks.
|
elseif mode ~= 'c' then -- Else: discard remaining cmdline-mode chunks.
|
||||||
if phase < 2 and mode ~= 'i' and mode ~= 'R' then
|
if phase < 2 and mode ~= 'i' and mode ~= 'R' and mode ~= 't' then
|
||||||
vim.api.nvim_put(lines, 'c', true, true)
|
vim.api.nvim_put(lines, 'c', true, true)
|
||||||
-- XXX: Normal-mode: workaround bad cursor-placement after first chunk.
|
-- XXX: Normal-mode: workaround bad cursor-placement after first chunk.
|
||||||
vim.api.nvim_command('normal! a')
|
vim.api.nvim_command('normal! a')
|
||||||
|
@ -306,6 +306,33 @@ describe('TUI', function()
|
|||||||
expect_child_buf_lines({''})
|
expect_child_buf_lines({''})
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
it('paste: terminal mode', function()
|
||||||
|
feed_data(':set statusline=^^^^^^^\n')
|
||||||
|
feed_data(':terminal '..nvim_dir..'/tty-test\n')
|
||||||
|
feed_data('i')
|
||||||
|
screen:expect{grid=[[
|
||||||
|
tty ready |
|
||||||
|
{1: } |
|
||||||
|
|
|
||||||
|
|
|
||||||
|
{5:^^^^^^^ }|
|
||||||
|
{3:-- TERMINAL --} |
|
||||||
|
{3:-- TERMINAL --} |
|
||||||
|
]]}
|
||||||
|
feed_data('\027[200~')
|
||||||
|
feed_data('hallo')
|
||||||
|
feed_data('\027[201~')
|
||||||
|
screen:expect{grid=[[
|
||||||
|
tty ready |
|
||||||
|
hallo{1: } |
|
||||||
|
|
|
||||||
|
|
|
||||||
|
{5:^^^^^^^ }|
|
||||||
|
{3:-- TERMINAL --} |
|
||||||
|
{3:-- TERMINAL --} |
|
||||||
|
]]}
|
||||||
|
end)
|
||||||
|
|
||||||
it('paste: normal-mode (+CRLF #10872)', function()
|
it('paste: normal-mode (+CRLF #10872)', function()
|
||||||
feed_data(':set ruler')
|
feed_data(':set ruler')
|
||||||
wait_for_mode('c')
|
wait_for_mode('c')
|
||||||
@ -512,7 +539,7 @@ describe('TUI', function()
|
|||||||
|
|
|
|
||||||
{4:~ }|
|
{4:~ }|
|
||||||
{5: }|
|
{5: }|
|
||||||
{8:paste: Error executing lua: vim.lua:196: Vim:E21: }|
|
{8:paste: Error executing lua: vim.lua:197: Vim:E21: }|
|
||||||
{8:Cannot make changes, 'modifiable' is off} |
|
{8:Cannot make changes, 'modifiable' is off} |
|
||||||
{10:Press ENTER or type command to continue}{1: } |
|
{10:Press ENTER or type command to continue}{1: } |
|
||||||
{3:-- TERMINAL --} |
|
{3:-- TERMINAL --} |
|
||||||
|
Loading…
Reference in New Issue
Block a user