Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: correctly restore cursor position in original window #2336

Merged
merged 2 commits into from
May 24, 2023
Merged

fix: correctly restore cursor position in original window #2336

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a4cd56
fix: correctly restore cursor position in original window
cristiansofronie Jan 19, 2023
ceeb068
always exit in normal mode to prevent cursor movement
cristiansofronie Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: correctly restore cursor position in original window
  • Loading branch information
@cristiansofronie @Conni2461
cristiansofronie authored and Conni2461 committed May 24, 2023
commit 0a4cd56115a1b8cefbe94a2f606afe00614d87cb
5 changes: 3 additions & 2 deletions lua/telescope/actions/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,13 +374,14 @@ 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 })
vim.defer_fn(function()
pcall(a.nvim_win_set_cursor, original_win_id, { original_cursor[1], original_cursor[2] })
end, 0)
end
end

Expand Down