mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-16 08:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

paste: do not clobber msg area for small pastes

Browse Source
This commit is contained in:
Justin M. Keyes
2019-09-08 15:37:24 -07:00
parent 0dea44f93c
commit acd2729573
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/lua/vim.lua
View File

@@ -203,8 +203,7 @@ paste = (function()
vim.api.nvim_command(('echo "%s"'):format(dots)) vim.api.nvim_command(('echo "%s"'):format(dots))
end end
if phase == -1 or phase == 3 then if phase == -1 or phase == 3 then
vim.api.nvim_command('redraw') vim.api.nvim_command('redraw'..(tick > 1 and '|echo ""' or ''))
vim.api.nvim_command('echo ""')
end end
return true -- Paste will not continue if not returning `true`. return true -- Paste will not continue if not returning `true`.
end end

8
test/functional/terminal/tui_spec.lua
View File

@@ -319,7 +319,7 @@ describe('TUI', function()
{1:x} | {1:x} |
{4:~ }| {4:~ }|
{5:[No Name] [+] 3,1 All}| {5:[No Name] [+] 3,1 All}|
| :set ruler |
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]] ]]
local expected_attr = { local expected_attr = {
@@ -353,7 +353,11 @@ describe('TUI', function()
expect_child_buf_lines({''}) expect_child_buf_lines({''})
-- CRLF input -- CRLF input
feed_data('\027[200~'..table.concat(expected_lf,'\r\n')..'\027[201~') feed_data('\027[200~'..table.concat(expected_lf,'\r\n')..'\027[201~')
screen:expect{grid=expected_grid1, attr_ids=expected_attr} screen:expect{
grid=expected_grid1:gsub(
':set ruler *',
'3 fewer lines; before #1 0 seconds ago '),
attr_ids=expected_attr}
expect_child_buf_lines(expected_crlf) expect_child_buf_lines(expected_crlf)
end) end)