From 3eb90430b61b78b707e8ffe0cfe49138daaddbcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Boczar?= Date: Thu, 2 Jun 2022 16:00:14 +0200 Subject: [PATCH] fix: error in action.close when picker.original_win_id is not valid (#1982) --- lua/telescope/actions/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/telescope/actions/init.lua b/lua/telescope/actions/init.lua index 60171d3..2c4624b 100644 --- a/lua/telescope/actions/init.lua +++ b/lua/telescope/actions/init.lua @@ -345,13 +345,13 @@ end actions.close = function(prompt_bufnr) local picker = action_state.get_current_picker(prompt_bufnr) local original_win_id = picker.original_win_id - local original_cursor = a.nvim_win_get_cursor(original_win_id) + local cursor_valid, original_cursor = pcall(a.nvim_win_get_cursor, original_win_id) actions.close_pum(prompt_bufnr) require("telescope.pickers").on_close_prompt(prompt_bufnr) pcall(a.nvim_set_current_win, original_win_id) - if a.nvim_get_mode().mode == "i" and picker._original_mode ~= "i" then + if cursor_valid and a.nvim_get_mode().mode == "i" and picker._original_mode ~= "i" then pcall(a.nvim_win_set_cursor, original_win_id, { original_cursor[1], original_cursor[2] + 1 }) end end