Feat: Create Merge Request (#149)

- Adds the ability to create MRs to the plugin
- Adds the ability to jump to specific discussions/notes in the browser
- Fixes stale icons
- Adds debug keybinding for discussion tree for developers

lua/gitlab/actions/discussions/annotations.lua

@@ -49,6 +49,7 @@
 ---@field resolved_by Author
 ---@field resolved_at string?
 ---@field noteable_iid integer
+---@field url string?
 
 ---@class UnlinkedNote: Note
 ---@field position nil

lua/gitlab/actions/discussions/init.lua

@@ -37,7 +37,7 @@ local M = {
 ---callback with data
 ---@param callback (fun(data: DiscussionData): nil)?
 M.load_discussions = function(callback)
-  job.run_job("/discussions/list", "POST", { blacklist = state.settings.discussion_tree.blacklist }, function(data)
+  job.run_job("/mr/discussions/list", "POST", { blacklist = state.settings.discussion_tree.blacklist }, function(data)
     M.discussions = data.discussions ~= vim.NIL and data.discussions or {}
     M.unlinked_discussions = data.unlinked_discussions ~= vim.NIL and data.unlinked_discussions or {}
     if type(callback) == "function" then
@@ -52,7 +52,7 @@ M.initialize_discussions = function()
   -- Setup callback to refresh discussion data, discussion signs and diagnostics whenever the reviewed file changes.
   reviewer.set_callback_for_file_changed(M.refresh_discussion_data)
   -- Setup callback to clear signs and diagnostics whenever reviewer is left.
-  reviewer.set_callback_for_reviewer_leave(signs.clear_signs_and_discussions)
+  reviewer.set_callback_for_reviewer_leave(signs.clear_signs_and_diagnostics)
 end
 
 ---Refresh discussion data, signs, diagnostics, and winbar with new data from API
@@ -209,7 +209,7 @@ end
 M.send_reply = function(tree, discussion_id)
   return function(text)
     local body = { discussion_id = discussion_id, reply = text }
-    job.run_job("/reply", "POST", body, function(data)
+    job.run_job("/mr/reply", "POST", body, function(data)
       u.notify("Sent reply!", vim.log.levels.INFO)
       M.add_reply_to_tree(tree, data.note, discussion_id)
       M.load_discussions()
@@ -239,7 +239,7 @@ M.send_deletion = function(tree, unlinked)
 
   local body = { discussion_id = root_node.id, note_id = tonumber(note_id) }
 
-  job.run_job("/comment", "DELETE", body, function(data)
+  job.run_job("/mr/comment", "DELETE", body, function(data)
     u.notify(data.message, vim.log.levels.INFO)
     if not note_node.is_root then
       tree:remove_node("-" .. note_id) -- Note is not a discussion root, safe to remove
@@ -301,7 +301,7 @@ M.send_edits = function(discussion_id, note_id, unlinked)
       note_id = note_id,
       comment = text,
     }
-    job.run_job("/comment", "PATCH", body, function(data)
+    job.run_job("/mr/comment", "PATCH", body, function(data)
       u.notify(data.message, vim.log.levels.INFO)
       M.rebuild_discussion_tree()
       if unlinked then
@@ -327,7 +327,7 @@ M.toggle_discussion_resolved = function(tree)
     resolved = not note.resolved,
   }
 
-  job.run_job("/discussions/resolve", "PUT", body, function(data)
+  job.run_job("/mr/discussions/resolve", "PUT", body, function(data)
     u.notify(data.message, vim.log.levels.INFO)
     M.redraw_resolved_status(tree, note, not note.resolved)
     M.refresh_discussion_data()
@@ -572,6 +572,12 @@ M.set_tree_keymaps = function(tree, bufnr, unlinked)
       end
     end, { buffer = bufnr, desc = "Jump to reviewer" })
   end
+  vim.keymap.set("n", state.settings.discussion_tree.open_in_browser, function()
+    M.open_in_browser(tree)
+  end, { buffer = bufnr, desc = "Open the note in your browser" })
+  vim.keymap.set("n", "<leader>p", function()
+    M.print_node(tree)
+  end, { buffer = bufnr, desc = "dev_ Print current node (for debugging)" })
 end
 
 M.redraw_resolved_status = function(tree, note, mark_resolved)
@@ -683,4 +689,26 @@ M.get_note_location = function(tree)
     nil
 end
 
+---@param tree NuiTree
+M.open_in_browser = function(tree)
+  local current_node = tree:get_node()
+  local note_node = M.get_note_node(tree, current_node)
+  if note_node == nil then
+    return
+  end
+  local url = note_node.url
+  if url == nil then
+    u.notify("Could not get URL of note", vim.log.levels.ERROR)
+    return
+  end
+
+  u.open_in_browser(url)
+end
+
+-- For developers!
+M.print_node = function(tree)
+  local current_node = tree:get_node()
+  vim.print(current_node)
+end
+
 return M

lua/gitlab/actions/discussions/signs.lua

@@ -11,7 +11,7 @@ local M = {}
 M.diagnostics_namespace = diagnostics_namespace
 
 ---Clear all signs and diagnostics
-M.clear_signs_and_discussions = function()
+M.clear_signs_and_diagnostics = function()
   vim.fn.sign_unplace(discussion_sign_name)
   vim.diagnostic.reset(diagnostics_namespace)
 end

lua/gitlab/actions/discussions/tree.lua

@@ -131,6 +131,7 @@ M.build_note = function(note, resolve_info)
     file_name = (type(note.position) == "table" and note.position.new_path),
     new_line = (type(note.position) == "table" and note.position.new_line),
     old_line = (type(note.position) == "table" and note.position.old_line),
+    url = state.INFO.web_url .. "#note_" .. note.id,
     type = "note",
   }, text_nodes)
 
@@ -161,11 +162,11 @@ M.add_discussions_to_table = function(items, unlinked)
     local undefined_type = false
     local root_new_line = nil
     local root_old_line = nil
+    local root_url
 
     for j, note in ipairs(discussion.notes) do
       if j == 1 then
         _, root_text, root_text_nodes = M.build_note(note, { resolved = note.resolved, resolvable = note.resolvable })
-
         root_file_name = (type(note.position) == "table" and note.position.new_path or nil)
         root_new_line = (type(note.position) == "table" and note.position.new_line or nil)
         root_old_line = (type(note.position) == "table" and note.position.old_line or nil)
@@ -173,6 +174,7 @@ M.add_discussions_to_table = function(items, unlinked)
         root_note_id = tostring(note.id)
         resolvable = note.resolvable
         resolved = note.resolved
+        root_url = state.INFO.web_url .. "#note_" .. note.id
 
         -- This appears to be a Gitlab 🐛 where the "type" is returned as an empty string in some cases
         -- We link these comments to the old file by default
@@ -203,6 +205,7 @@ M.add_discussions_to_table = function(items, unlinked)
       resolvable = resolvable,
       resolved = resolved,
       undefined_type = undefined_type,
+      url = root_url,
     }, body)
 
     table.insert(t, root_node)

lua/gitlab/actions/discussions/winbar.lua

@@ -52,7 +52,8 @@ end
 M.update_winbar = function(discussions, unlinked_discussions, base_title)
   local d = require("gitlab.actions.discussions")
   local winId = d.split.winid
-  vim.wo[winId].winbar = content(discussions, unlinked_discussions, base_title)
+  local c = content(discussions, unlinked_discussions, base_title)
+  vim.wo[winId].winbar = c
 end
 
 return M