luxolus
/
dressing.nvim
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(input): restore previous mode after leaving modal

This commit is contained in:
Steven Arcangeli 2022-01-17 13:17:43 -08:00
parent d5eaf13b80
commit 25b72621af
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lua/dressing/input.lua
View File

@ -8,6 +8,7 @@ local context = {
winid = nil, winid = nil,
history_idx = nil, history_idx = nil,
history_tip = nil, history_tip = nil,
start_in_insert = nil,
} }
local function set_input(text) local function set_input(text)
@ -52,7 +53,9 @@ local function confirm(text)
close_completion_window() close_completion_window()
local ctx = context local ctx = context
context = {} context = {}
vim.cmd("stopinsert") if not ctx.start_in_insert then
vim.cmd("stopinsert")
end
-- We have to wait briefly for the popup window to close (if present), -- We have to wait briefly for the popup window to close (if present),
-- otherwise vim gets into a very weird and bad state. I was seeing text get -- otherwise vim gets into a very weird and bad state. I was seeing text get
-- deleted from the buffer after the input window closes. -- deleted from the buffer after the input window closes.
@ -181,7 +184,7 @@ setmetatable(M, {
style = "minimal", style = "minimal",
noautocmd = true, noautocmd = true,
} }
local winid, bufnr local winid, bufnr, start_in_insert
-- If the input window is already open, hijack it -- If the input window is already open, hijack it
if context.winid and vim.api.nvim_win_is_valid(context.winid) then if context.winid and vim.api.nvim_win_is_valid(context.winid) then
winid = context.winid winid = context.winid
@ -189,7 +192,9 @@ setmetatable(M, {
vim.schedule(context.on_confirm) vim.schedule(context.on_confirm)
vim.api.nvim_win_set_width(winid, width) vim.api.nvim_win_set_width(winid, width)
bufnr = vim.api.nvim_win_get_buf(winid) bufnr = vim.api.nvim_win_get_buf(winid)
start_in_insert = context.start_in_insert
else else
start_in_insert = string.sub(vim.api.nvim_get_mode().mode, 1, 2) == "i"
bufnr = vim.api.nvim_create_buf(false, true) bufnr = vim.api.nvim_create_buf(false, true)
winid = vim.api.nvim_open_win(bufnr, true, winopt) winid = vim.api.nvim_open_win(bufnr, true, winopt)
end end
@ -198,6 +203,7 @@ setmetatable(M, {
on_confirm = on_confirm, on_confirm = on_confirm,
opts = opts, opts = opts,
history_idx = nil, history_idx = nil,
start_in_insert = start_in_insert,
} }
vim.api.nvim_win_set_option(winid, "winblend", config.winblend) vim.api.nvim_win_set_option(winid, "winblend", config.winblend)
vim.api.nvim_win_set_option(winid, "winhighlight", config.winhighlight) vim.api.nvim_win_set_option(winid, "winhighlight", config.winhighlight)