fix(pickers): misc initial_mode setting fixes (#1895)

This commit is contained in:
fdschmidt93
2022-05-03 08:53:22 +02:00
committed by GitHub
parent 23e28d066a
commit e454a0ad37

View File

@@ -434,16 +434,24 @@ function Picker:find()
self:set_prompt(self.default_text) self:set_prompt(self.default_text)
end end
if self.initial_mode == "insert" then if vim.tbl_contains({ "insert", "normal" }, self.initial_mode) then
vim.schedule(function() vim.schedule(function()
-- startinsert! did not reliable do `A` no idea why, i even looked at the source code
-- Example: live_grep -> type something -> quit -> Telescope pickers -> resume -> cursor of by one
local mode = vim.fn.mode() local mode = vim.fn.mode()
if mode ~= "i" then if self.initial_mode == "normal" then
a.nvim_input(mode ~= "n" and "<ESC>A" or "A") if mode ~= "n" then
a.nvim_input "<ESC>"
end
else
-- Example: live_grep -> type something -> quit -> Telescope pickers -> resume -> cursor of by one
-- vim.cmd doesn't schedule appropriately, bypass with `nvim_input`
-- histdel('cmd', -1) to not pollute command history with startinsert & echon to clear "startinsert" msg
if mode ~= "i" then
local cmd = ":startinsert!|call histdel('cmd', -1)|echon ''<CR>"
a.nvim_input(mode ~= "n" and "<ESC>" .. cmd or cmd)
end
end end
end) end)
elseif self.initial_mode ~= "normal" then else
error("Invalid setting for initial_mode: " .. self.initial_mode) error("Invalid setting for initial_mode: " .. self.initial_mode)
end end