fix: restore cursor when updating from outside of tree

Author: jakubbortlik

lua/gitlab/actions/discussions/init.lua

@@ -433,7 +433,7 @@ M.rebuild_discussion_tree = function()
     return
   end
 
-  local current_node = discussions_tree.get_node_at_cursor(M.split.winid, M.linked_bufnr, M.discussion_tree)
+  local current_node = discussions_tree.get_node_at_cursor(M.discussion_tree, M.last_node_at_cursor)
 
   local expanded_node_ids = M.gather_expanded_node_ids(M.discussion_tree)
   common.switch_can_edit_bufs(true, M.linked_bufnr, M.unlinked_bufnr)
@@ -472,8 +472,7 @@ M.rebuild_unlinked_discussion_tree = function()
     return
   end
 
-  -- save current node for restoring cursor position
-  local current_node = discussions_tree.get_node_at_cursor(M.split.winid, M.unlinked_bufnr, M.unlinked_discussion_tree)
+  local current_node = discussions_tree.get_node_at_cursor(M.unlinked_discussion_tree, M.last_node_at_cursor)
 
   local expanded_node_ids = M.gather_expanded_node_ids(M.unlinked_discussion_tree)
   common.switch_can_edit_bufs(true, M.linked_bufnr, M.unlinked_bufnr)
@@ -545,6 +544,14 @@ M.create_split_and_bufs = function()
     buffer = linked_bufnr,
     callback = function()
       M.last_row, M.last_column = unpack(vim.api.nvim_win_get_cursor(0))
+      M.last_node_at_cursor = M.discussion_tree and M.discussion_tree:get_node() or nil
+    end,
+  })
+
+  vim.api.nvim_create_autocmd("WinLeave", {
+    buffer = unlinked_bufnr,
+    callback = function()
+      M.last_node_at_cursor = M.unlinked_discussion_tree and M.unlinked_discussion_tree:get_node() or nil
     end,
   })
 

lua/gitlab/actions/discussions/tree.lua

@@ -423,12 +423,16 @@ M.toggle_nodes = function(winid, tree, unlinked, opts)
 end
 
 -- Get current node for restoring cursor position
----@param winid integer Window number of the discussions split
----@param bufnr integer Buffer number of the current tree
 ---@param tree NuiTree The inline discussion tree or the unlinked discussion tree
-M.get_node_at_cursor = function(winid, bufnr, tree)
-  if vim.api.nvim_get_current_win() == winid and vim.api.nvim_get_current_buf() == bufnr and tree ~= nil then
+---@param last_node NuiTree.Node|nil The last active discussion tree node in case we are not in any of the discussion trees
+M.get_node_at_cursor = function(tree, last_node)
+  if tree == nil then
+    return
+  end
+  if vim.api.nvim_get_current_win() == vim.fn.win_findbuf(tree.bufnr)[1] then
     return tree:get_node()
+  else
+    return last_node
   end
 end