From b623c0611928e9370c86a0d356bc38e4925bdeaa Mon Sep 17 00:00:00 2001 From: "Harrison (Harry) Cramer" <32515581+harrisoncramer@users.noreply.github.com> Date: Sat, 20 Jan 2024 23:35:56 -0500 Subject: [PATCH] Fix: Write to correct window if user changes during loading state (#167) This MR fixes issue #165 where you could accidentally load the discussions tree into the wrong window if you switched while the content was still loading. This is a PATCH release. --- lua/gitlab/actions/discussions/init.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lua/gitlab/actions/discussions/init.lua b/lua/gitlab/actions/discussions/init.lua index 6fb834e..d000e62 100644 --- a/lua/gitlab/actions/discussions/init.lua +++ b/lua/gitlab/actions/discussions/init.lua @@ -105,6 +105,9 @@ M.toggle = function(callback) return end + local current_window = vim.api.nvim_get_current_win() -- Save user's current window in case they switched while content was loading + vim.api.nvim_set_current_win(M.split.winid) + M.rebuild_discussion_tree() M.rebuild_unlinked_discussion_tree() M.add_empty_titles({ @@ -118,6 +121,8 @@ M.toggle = function(callback) M.switch_can_edit_bufs(false) winbar.update_winbar(M.discussions, M.unlinked_discussions, default_discussions and "Discussions" or "Notes") + + vim.api.nvim_set_current_win(current_window) if type(callback) == "function" then callback() end