fix rename

This commit is contained in:
sgraves committed 2026-11-19 14:57:27 +00:00
1 parent 570d3a5476
commit b3ecdea33b
1 file changed
+46 -12
+46 -12
View File
@@ -34,7 +34,8 @@ local function editor_width(prompt, default)
local columns = vim.o.columns local columns = vim.o.columns
local minimum = math.max(20, math.floor(columns * 0.2)) local minimum = math.max(20, math.floor(columns * 0.2))
local maximum = math.min(140, math.floor(columns * 0.9), columns - 4) local maximum = math.min(140, math.floor(columns * 0.9), columns - 4)
local preferred = math.max( local preferred =
math.max(
40, 40,
vim.api.nvim_strwidth(prompt) + 4, vim.api.nvim_strwidth(prompt) + 4,
vim.api.nvim_strwidth(default) + 2 vim.api.nvim_strwidth(default) + 2
@@ -46,7 +47,8 @@ end
local function cursor_width(prompt, default) local function cursor_width(prompt, default)
local maximum = math.min(80, vim.o.columns - 2) local maximum = math.min(80, vim.o.columns - 2)
local preferred = math.max( local preferred =
math.max(
32, 32,
vim.api.nvim_strwidth(title(prompt)), vim.api.nvim_strwidth(title(prompt)),
vim.api.nvim_strwidth(default) + 2 vim.api.nvim_strwidth(default) + 2
@@ -58,7 +60,8 @@ local function window_config(opts, prompt, default)
if opts.scope == "cursor" or opts.scope == "line" then if opts.scope == "cursor" or opts.scope == "line" then
local width = cursor_width(prompt, default) local width = cursor_width(prompt, default)
local position = vim.fn.screenpos(0, vim.fn.line("."), vim.fn.col(".")) local position = vim.fn.screenpos(0, vim.fn.line("."), vim.fn.col("."))
local screen_column = math.max(0, (position.curscol or position.col or 1) - 1) local screen_column =
math.max(0, (position.curscol or position.col or 1) - 1)
local column = 0 local column = 0
if screen_column + width + 2 > vim.o.columns then if screen_column + width + 2 > vim.o.columns then
column = vim.o.columns - screen_column - width - 2 column = vim.o.columns - screen_column - width - 2
@@ -156,7 +159,10 @@ local function show_next()
local position = window_config(opts, prompt, default) local position = window_config(opts, prompt, default)
local bufnr = vim.api.nvim_create_buf(false, true) local bufnr = vim.api.nvim_create_buf(false, true)
local mode = vim.api.nvim_get_mode().mode:sub(1, 1) local mode = vim.api.nvim_get_mode().mode:sub(1, 1)
local winid = vim.api.nvim_open_win( local origin_winid = vim.api.nvim_get_current_win()
local origin_cursor = vim.api.nvim_win_get_cursor(origin_winid)
local winid =
vim.api.nvim_open_win(
bufnr, bufnr,
true, true,
{ {
@@ -179,6 +185,8 @@ local function show_next()
history_tip = nil, history_tip = nil,
mode = mode, mode = mode,
opts = opts, opts = opts,
origin_cursor = origin_cursor,
origin_winid = origin_winid,
winid = winid winid = winid
} }
@@ -213,22 +221,32 @@ local function show_next()
if opts.completion then if opts.completion then
vim.bo[bufnr].completefunc = "v:lua.require'darcula.ui.input'.completefunc" vim.bo[bufnr].completefunc = "v:lua.require'darcula.ui.input'.completefunc"
if not has_cmp or not pcall(require, "cmp_omni") then if not has_cmp or not pcall(require, "cmp_omni") then
vim.keymap.set("i", "<Tab>", M.trigger_completion, { vim.keymap.set(
"i",
"<Tab>",
M.trigger_completion,
{
buffer = bufnr, buffer = bufnr,
expr = true, expr = true,
silent = true silent = true
}) }
)
end end
end end
vim.api.nvim_create_autocmd({"TextChanged", "TextChangedI"}, { vim.api.nvim_create_autocmd(
{"TextChanged", "TextChangedI"},
{
buffer = bufnr, buffer = bufnr,
callback = function() callback = function()
keep_one_line() keep_one_line()
apply_highlight() apply_highlight()
end end
}) }
vim.api.nvim_create_autocmd("BufLeave", { )
vim.api.nvim_create_autocmd(
"BufLeave",
{
buffer = bufnr, buffer = bufnr,
callback = function() callback = function()
if context and context.bufnr == bufnr and not context.closing then if context and context.bufnr == bufnr and not context.closing then
@@ -236,7 +254,8 @@ local function show_next()
end end
end, end,
once = true once = true
}) }
)
apply_highlight() apply_highlight()
vim.cmd("startinsert!") vim.cmd("startinsert!")
@@ -264,10 +283,25 @@ local function finish(value)
vim.cmd("stopinsert") vim.cmd("stopinsert")
end end
vim.schedule(function() vim.schedule(
function()
-- Leaving insert mode moves the cursor one column left in the original
-- window. Restore it so callbacks (e.g. LSP rename) see the original
-- position.
if
finished.mode ~= "i" and
vim.api.nvim_win_is_valid(finished.origin_winid)
then
pcall(
vim.api.nvim_win_set_cursor,
finished.origin_winid,
finished.origin_cursor
)
end
vim.schedule(show_next) vim.schedule(show_next)
finished.callback(value) finished.callback(value)
end) end
)
end end
function M.confirm() function M.confirm()