mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
refactor(paste): do not print dots in cmdline mode
This commit is contained in:
zeertzjq
parent
bfb7754442
commit
21ba2d81a8
@ -157,60 +157,64 @@ do
|
||||
---@returns false if client should cancel the paste.
|
||||
function vim.paste(lines, phase)
|
||||
local now = vim.loop.now()
|
||||
local mode = vim.api.nvim_get_mode().mode
|
||||
local is_cmdline = vim.fn.getcmdtype() ~= ''
|
||||
if phase < 2 then -- Reset flags.
|
||||
local is_first_chunk = phase < 2
|
||||
if is_first_chunk then -- Reset flags.
|
||||
tdots, tick, got_line1 = now, 0, false
|
||||
elseif not is_cmdline then
|
||||
end
|
||||
-- Note: mode doesn't always start with "c" in cmdline mode, so use getcmdtype() instead.
|
||||
if vim.fn.getcmdtype() ~= '' then -- cmdline-mode: paste only 1 line.
|
||||
if not got_line1 then
|
||||
got_line1 = (#lines > 1)
|
||||
vim.api.nvim_set_option('paste', true) -- For nvim_input().
|
||||
local line1 = lines[1]:gsub('<', '<lt>'):gsub('[\r\n\012\027]', ' ') -- Scrub.
|
||||
vim.api.nvim_input(line1)
|
||||
vim.api.nvim_set_option('paste', false)
|
||||
end
|
||||
return true
|
||||
end
|
||||
local mode = vim.api.nvim_get_mode().mode
|
||||
if not is_first_chunk then
|
||||
vim.api.nvim_command('undojoin')
|
||||
end
|
||||
if is_cmdline and not got_line1 then -- cmdline-mode: paste only 1 line.
|
||||
got_line1 = (#lines > 1)
|
||||
vim.api.nvim_set_option('paste', true) -- For nvim_input().
|
||||
local line1 = lines[1]:gsub('<', '<lt>'):gsub('[\r\n\012\027]', ' ') -- Scrub.
|
||||
vim.api.nvim_input(line1)
|
||||
vim.api.nvim_set_option('paste', false)
|
||||
elseif not is_cmdline then
|
||||
if mode:find('^i') or mode:find('^n?t') then -- Insert mode or Terminal buffer
|
||||
vim.api.nvim_put(lines, 'c', false, true)
|
||||
elseif phase < 2 and mode:find('^R') and not mode:find('^Rv') then -- Replace mode
|
||||
-- TODO: implement Replace mode streamed pasting
|
||||
-- TODO: support Virtual Replace mode
|
||||
local nchars = 0
|
||||
for _, line in ipairs(lines) do
|
||||
nchars = nchars + line:len()
|
||||
end
|
||||
local row, col = unpack(vim.api.nvim_win_get_cursor(0))
|
||||
local bufline = vim.api.nvim_buf_get_lines(0, row-1, row, true)[1]
|
||||
local firstline = lines[1]
|
||||
firstline = bufline:sub(1, col)..firstline
|
||||
lines[1] = firstline
|
||||
-- FIXME: #lines can be 0
|
||||
lines[#lines] = lines[#lines]..bufline:sub(col + nchars + 1, bufline:len())
|
||||
vim.api.nvim_buf_set_lines(0, row-1, row, false, lines)
|
||||
elseif mode:find('^[nvV\22sS\19]') then -- Normal or Visual or Select mode
|
||||
if mode:find('^n') then -- Normal mode
|
||||
vim.api.nvim_put(lines, 'c', true, false)
|
||||
else -- Visual or Select mode
|
||||
vim.api.nvim_command([[exe "silent normal! \<Del>"]])
|
||||
local del_start = vim.fn.getpos("'[")
|
||||
local cursor_pos = vim.fn.getpos('.')
|
||||
if mode:find('^[VS]') then -- linewise
|
||||
if cursor_pos[2] < del_start[2] then -- replacing lines at eof
|
||||
-- create a new line
|
||||
vim.api.nvim_put({''}, 'l', true, true)
|
||||
end
|
||||
vim.api.nvim_put(lines, 'c', false, false)
|
||||
else
|
||||
-- paste after cursor when replacing text at eol, otherwise paste before cursor
|
||||
vim.api.nvim_put(lines, 'c', cursor_pos[3] < del_start[3], false)
|
||||
end
|
||||
end
|
||||
-- put cursor at the end of the text instead of one character after it
|
||||
vim.fn.setpos('.', vim.fn.getpos("']"))
|
||||
else -- Don't know what to do in other modes
|
||||
return false
|
||||
if mode:find('^i') or mode:find('^n?t') then -- Insert mode or Terminal buffer
|
||||
vim.api.nvim_put(lines, 'c', false, true)
|
||||
elseif phase < 2 and mode:find('^R') and not mode:find('^Rv') then -- Replace mode
|
||||
-- TODO: implement Replace mode streamed pasting
|
||||
-- TODO: support Virtual Replace mode
|
||||
local nchars = 0
|
||||
for _, line in ipairs(lines) do
|
||||
nchars = nchars + line:len()
|
||||
end
|
||||
local row, col = unpack(vim.api.nvim_win_get_cursor(0))
|
||||
local bufline = vim.api.nvim_buf_get_lines(0, row-1, row, true)[1]
|
||||
local firstline = lines[1]
|
||||
firstline = bufline:sub(1, col)..firstline
|
||||
lines[1] = firstline
|
||||
-- FIXME: #lines can be 0
|
||||
lines[#lines] = lines[#lines]..bufline:sub(col + nchars + 1, bufline:len())
|
||||
vim.api.nvim_buf_set_lines(0, row-1, row, false, lines)
|
||||
elseif mode:find('^[nvV\22sS\19]') then -- Normal or Visual or Select mode
|
||||
if mode:find('^n') then -- Normal mode
|
||||
vim.api.nvim_put(lines, 'c', true, false)
|
||||
else -- Visual or Select mode
|
||||
vim.api.nvim_command([[exe "silent normal! \<Del>"]])
|
||||
local del_start = vim.fn.getpos("'[")
|
||||
local cursor_pos = vim.fn.getpos('.')
|
||||
if mode:find('^[VS]') then -- linewise
|
||||
if cursor_pos[2] < del_start[2] then -- replacing lines at eof
|
||||
-- create a new line
|
||||
vim.api.nvim_put({''}, 'l', true, true)
|
||||
end
|
||||
vim.api.nvim_put(lines, 'c', false, false)
|
||||
else
|
||||
-- paste after cursor when replacing text at eol, otherwise paste before cursor
|
||||
vim.api.nvim_put(lines, 'c', cursor_pos[3] < del_start[3], false)
|
||||
end
|
||||
end
|
||||
-- put cursor at the end of the text instead of one character after it
|
||||
vim.fn.setpos('.', vim.fn.getpos("']"))
|
||||
else -- Don't know what to do in other modes
|
||||
return false
|
||||
end
|
||||
if phase ~= -1 and (now - tdots >= 100) then
|
||||
local dots = ('.'):rep(tick % 4)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user