Refactor: Move duplicated code to common functions

Author: jakubbortlik

lua/gitlab/actions/discussions/init.lua

@@ -433,15 +433,7 @@ M.rebuild_discussion_tree = function()
     return
   end
 
-  -- save current node for restoring cursor position
-  local current_node
-  if
-    vim.api.nvim_get_current_win() == M.split.winid
-    and vim.api.nvim_get_current_buf() == M.linked_bufnr
-    and M.discussion_tree ~= nil
-  then
-    current_node = M.discussion_tree:get_node()
-  end
+  local current_node = discussions_tree.get_node_at_cursor(M.split.winid, M.linked_bufnr, M.discussion_tree)
 
   local expanded_node_ids = M.gather_expanded_node_ids(M.discussion_tree)
   common.switch_can_edit_bufs(true, M.linked_bufnr, M.unlinked_bufnr)
@@ -464,11 +456,7 @@ M.rebuild_discussion_tree = function()
     tree_utils.open_node_by_id(discussion_tree, id)
   end
   discussion_tree:render()
-
-  if current_node ~= nil then
-    local root_node = common.get_root_node(M.discussion_tree, current_node)
-    discussions_tree.restore_cursor_position(M.split.winid, discussion_tree, current_node, root_node)
-  end
+  discussions_tree.restore_cursor_position(M.split.winid, discussion_tree, current_node)
 
   M.set_tree_keymaps(discussion_tree, M.linked_bufnr, false)
   M.discussion_tree = discussion_tree
@@ -485,14 +473,7 @@ M.rebuild_unlinked_discussion_tree = function()
   end
 
   -- save current node for restoring cursor position
-  local current_node
-  if
-    vim.api.nvim_get_current_win() == M.split.winid
-    and vim.api.nvim_get_current_buf() == M.unlinked_bufnr
-    and M.unlinked_discussion_tree ~= nil
-  then
-    current_node = M.unlinked_discussion_tree:get_node()
-  end
+  local current_node = discussions_tree.get_node_at_cursor(M.split.winid, M.unlinked_bufnr, M.unlinked_discussion_tree)
 
   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)
@@ -515,11 +496,7 @@ M.rebuild_unlinked_discussion_tree = function()
     tree_utils.open_node_by_id(unlinked_discussion_tree, id)
   end
   unlinked_discussion_tree:render()
-
-  if current_node ~= nil then
-    local root_node = common.get_root_node(M.unlinked_discussion_tree, current_node)
-    discussions_tree.restore_cursor_position(M.split.winid, unlinked_discussion_tree, current_node, root_node)
-  end
+  discussions_tree.restore_cursor_position(M.split.winid, unlinked_discussion_tree, current_node)
 
   M.set_tree_keymaps(unlinked_discussion_tree, M.unlinked_bufnr, true)
   M.unlinked_discussion_tree = unlinked_discussion_tree

lua/gitlab/actions/discussions/tree.lua

@@ -422,12 +422,32 @@ M.toggle_nodes = function(winid, tree, unlinked, opts)
   M.restore_cursor_position(winid, tree, current_node, root_node)
 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
+    return tree:get_node()
+  end
+end
+
 ---Restore cursor position to the original node if possible
+---@param winid integer Window number of the discussions split
+---@param tree NuiTree The inline discussion tree or the unlinked discussion tree
+---@param original_node NuiTree.Node|nil The last node with the cursor
+---@param root_node NuiTree.Node|nil The root node of the last node with the cursor
 M.restore_cursor_position = function(winid, tree, original_node, root_node)
+  if original_node == nil or tree == nil then
+    return
+  end
   local _, line_number = tree:get_node("-" .. tostring(original_node.id))
-  -- If current_node is has been collapsed, get line number of root node instead
-  if line_number == nil and root_node then
-    _, line_number = tree:get_node("-" .. tostring(root_node.id))
+  -- If current_node has been collapsed, try to get line number of root node instead
+  if line_number == nil then
+    root_node = root_node and root_node or common.get_root_node(tree, original_node)
+    if root_node ~= nil then
+      _, line_number = tree:get_node("-" .. tostring(root_node.id))
+    end
   end
   if line_number ~= nil then
     vim.api.nvim_win_set_cursor(winid, { line_number, 0 })