Revert "fix: correctly restore cursor position in original window (#2336

)" (#2538)

This reverts commit 3f1b579.

(cherry picked from commit eb95a31)

lua/telescope/actions/init.lua

@@ -329,8 +329,17 @@ end
 --- Close the Telescope window, usually used within an action
 ---@param prompt_bufnr number: The prompt bufnr
 actions.close = function(prompt_bufnr)
+ local picker = action_state.get_current_picker(prompt_bufnr)
+ local original_win_id = picker.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 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
 
 --- Close the Telescope window, usually used within an action<br>

lua/telescope/pickers.lua

@@ -1493,12 +1493,7 @@ function pickers.on_close_prompt(prompt_bufnr)
  event = "BufLeave",
  buffer = prompt_bufnr,
  }
-
- vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<esc>", true, true, true), "n", true)
- vim.defer_fn(function()
- picker.close_windows(status)
- end, 0)
-
+ picker.close_windows(status)
  mappings.clear(prompt_bufnr)
 end