mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-07 10:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #10896 'paste: one undo-block'

Browse Source
This commit is contained in:
Justin M. Keyes
2019-09-01 19:12:13 -07:00
committed by GitHub
parent 938be1e0ab 8560bafc6c
commit b10d703213
5 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/api/vim.c
View File

@@ -1293,11 +1293,11 @@ theend:
/// Compare |:put| and |p| which are always linewise.
///
/// @param lines |readfile()|-style list of lines. |channel-lines|
/// @param type Edit behavior:
/// - "b" |blockwise-visual| mode
/// @param type Edit behavior: any |getregtype()| result, or:
/// - "b" |blockwise-visual| mode (may include width, e.g. "b3")
/// - "c" |characterwise| mode
/// - "l" |linewise| mode
/// - "" guess by contents
/// - "" guess by contents, see |setreg()|
/// @param after Insert after cursor (like |p|), or before (like |P|).
/// @param follow Place cursor at end of inserted text.
/// @param[out] err Error details, if any

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

@@ -175,13 +175,15 @@ end
--@returns false if client should cancel the paste.
local function paste(lines, phase) end -- luacheck: no unused
paste = (function()
local tdots, tredraw, tick, got_line1 = 0, 0, 0, false
local tdots, tick, got_line1 = 0, 0, false
return function(lines, phase)
local call = vim.api.nvim_call_function
local now = vim.loop.now()
local mode = call('mode', {}):sub(1,1)
if phase < 2 then -- Reset flags.
tdots, tredraw, tick, got_line1 = now, now, 0, false
tdots, tick, got_line1 = now, 0, false
elseif mode ~= 'c' then
vim.api.nvim_command('undojoin')
end
if mode == 'c' and not got_line1 then -- cmdline-mode: paste only 1 line.
got_line1 = (#lines > 1)
@@ -193,11 +195,6 @@ paste = (function()
else
vim.api.nvim_put(lines, 'c', true, true)
end
if (now - tredraw >= 1000) or phase == -1 or phase > 2 then
tredraw = now
vim.api.nvim_command('redraw')
vim.api.nvim_command('redrawstatus')
end
if phase ~= -1 and (now - tdots >= 100) then
local dots = ('.'):rep(tick % 4)
tdots = now
@@ -207,6 +204,7 @@ paste = (function()
vim.api.nvim_command(('echo "%s"'):format(dots))
end
if phase == -1 or phase == 3 then
vim.api.nvim_command('redraw')
vim.api.nvim_command('echo ""')
vim.api.nvim_set_option('paste', false)
end