This MR makes several major tweaks to the codebase. Primarily it adjusts the setup steps for the application so that rather than providing just the project ID in the `.gitlab.nvim` file, users can also provide a vareity of other settings, such as auth_token, base_branch, and so forth. This is to make the project more extensible in the future. This MR also fixes a variety of issues with error handling in the code, primarily in the request/response model between the Lua jobs and the Golang server. BREAKING CHANGE: Modifies `.gitlab.nvim` and setup steps
190 lines
5.8 KiB
Lua
190 lines
5.8 KiB
Lua
local Menu = require("nui.menu")
|
|
local NuiTree = require("nui.tree")
|
|
local job = require("gitlab.job")
|
|
local state = require("gitlab.state")
|
|
local u = require("gitlab.utils")
|
|
local keymaps = require("gitlab.keymaps")
|
|
local Popup = require("nui.popup")
|
|
local M = {}
|
|
|
|
local commentPopup = Popup(u.create_popup_state("Comment", "40%", "60%"))
|
|
local editPopup = Popup(u.create_popup_state("Edit Comment", "80%", "80%"))
|
|
|
|
M.line_status = nil
|
|
|
|
M.create_comment = function()
|
|
if u.base_invalid() then return end
|
|
commentPopup:mount()
|
|
keymaps.set_popup_keymaps(commentPopup, M.confirm_create_comment)
|
|
end
|
|
|
|
M.find_deletion_commit = function(file)
|
|
local current_line = vim.api.nvim_get_current_line()
|
|
local command = string.format("git log -S '%s' %s", current_line, file)
|
|
local handle = io.popen(command)
|
|
local output = handle:read("*line")
|
|
if output == nil then
|
|
vim.notify("Error reading SHA of deletion commit", vim.log.levels.ERROR)
|
|
return ""
|
|
end
|
|
handle:close()
|
|
local words = {}
|
|
for word in output:gmatch("%S+") do
|
|
table.insert(words, word)
|
|
end
|
|
|
|
return words[2]
|
|
end
|
|
|
|
-- Sends the comment to Gitlab
|
|
M.confirm_create_comment = function(text)
|
|
if u.base_invalid() then return end
|
|
local relative_file_path = u.get_relative_file_path()
|
|
local current_line_number = u.get_current_line_number()
|
|
if relative_file_path == nil then return end
|
|
|
|
-- If leaving a comment on a deleted line, get hash value + proper filename
|
|
local sha = ""
|
|
local is_base_file = relative_file_path:find(".git")
|
|
if is_base_file then -- We are looking at a deletion.
|
|
local _, path = u.split_diff_view_filename(relative_file_path)
|
|
relative_file_path = path
|
|
sha = M.find_deletion_commit(path)
|
|
if sha == "" then
|
|
return
|
|
end
|
|
end
|
|
|
|
local jsonTable = { line_number = current_line_number, file_name = relative_file_path, comment = text }
|
|
local json = vim.json.encode(jsonTable)
|
|
|
|
job.run_job("comment", "POST", json)
|
|
end
|
|
|
|
M.delete_comment = function()
|
|
local menu = Menu({
|
|
position = "50%",
|
|
size = {
|
|
width = 25,
|
|
},
|
|
border = {
|
|
style = "single",
|
|
text = {
|
|
top = "Delete Comment?",
|
|
top_align = "center",
|
|
},
|
|
},
|
|
win_options = {
|
|
winhighlight = "Normal:Normal,FloatBorder:Normal",
|
|
},
|
|
}, {
|
|
lines = {
|
|
Menu.item("Confirm"),
|
|
Menu.item("Cancel"),
|
|
},
|
|
max_width = 20,
|
|
keymap = {
|
|
focus_next = state.keymaps.dialogue.focus_next,
|
|
focus_prev = state.keymaps.dialogue.focus_prev,
|
|
close = state.keymaps.dialogue.close,
|
|
submit = state.keymaps.dialogue.submit,
|
|
},
|
|
on_submit = function(item)
|
|
if item.text == "Confirm" then
|
|
local note_id
|
|
local node = state.tree:get_node()
|
|
if node.is_note then
|
|
note_id = node:get_id()
|
|
end
|
|
local parentId = node:get_parent_id()
|
|
while (parentId ~= nil) do
|
|
node = state.tree:get_node(parentId)
|
|
parentId = node:get_parent_id()
|
|
if node.is_note then
|
|
note_id = node:get_id()
|
|
end
|
|
end
|
|
local discussion_id = node:get_id()
|
|
discussion_id = string.sub(discussion_id, 2) -- Remove the "-" at the start
|
|
note_id = tonumber(string.sub(note_id, 2)) -- Remove the "-" at the start
|
|
|
|
local jsonTable = { discussion_id = discussion_id, note_id = note_id }
|
|
local json = vim.json.encode(jsonTable)
|
|
|
|
job.run_job("comment", "DELETE", json, function(data)
|
|
vim.notify(data.message, vim.log.levels.INFO)
|
|
state.tree:remove_node("-" .. note_id)
|
|
local discussion_node = state.tree:get_node("-" .. discussion_id)
|
|
if not discussion_node:has_children() then
|
|
state.tree:remove_node("-" .. discussion_id)
|
|
end
|
|
state.tree:render()
|
|
end)
|
|
end
|
|
end,
|
|
})
|
|
menu:mount()
|
|
end
|
|
|
|
|
|
M.edit_comment = function()
|
|
if u.base_invalid() then return end
|
|
local node = state.tree:get_node()
|
|
if node.is_discussion then return end
|
|
if node.is_body then
|
|
local parentId = node:get_parent_id()
|
|
node = state.tree:get_node(parentId) -- Get the node for the comment
|
|
end
|
|
|
|
editPopup:mount()
|
|
|
|
local note_id = tonumber(string.sub(node:get_id(), 2)) -- Remove the "-" at the start
|
|
local discussion_id = node:get_parent_id()
|
|
discussion_id = string.sub(discussion_id, 2) -- Remove the "-" at the start
|
|
|
|
state.ACTIVE_DISCUSSION = discussion_id
|
|
state.ACTIVE_NOTE = note_id
|
|
|
|
local lines = {}
|
|
local childrenIds = node:get_child_ids()
|
|
for _, value in ipairs(childrenIds) do
|
|
local line = state.tree:get_node(value).text
|
|
table.insert(lines, line)
|
|
end
|
|
|
|
local currentBuffer = vim.api.nvim_get_current_buf()
|
|
vim.api.nvim_buf_set_lines(currentBuffer, 0, -1, false, lines)
|
|
keymaps.set_popup_keymaps(editPopup, M.send_edits)
|
|
end
|
|
|
|
M.send_edits = function(text)
|
|
local escapedText = string.gsub(text, "\n", "\\n")
|
|
|
|
local jsonTable = { discussion_id = state.ACTIVE_DISCUSSION, note_id = state.ACTIVE_NOTE, comment = escapedText }
|
|
local json = vim.json.encode(jsonTable)
|
|
|
|
job.run_job("comment", "PATCH", json, function()
|
|
vim.schedule(function()
|
|
local node = state.tree:get_node("-" .. state.ACTIVE_NOTE)
|
|
local childrenIds = node:get_child_ids()
|
|
for _, value in ipairs(childrenIds) do
|
|
state.tree:remove_node(value)
|
|
end
|
|
|
|
local newNoteTextNodes = {}
|
|
for bodyLine in text:gmatch("[^\n]+") do
|
|
table.insert(newNoteTextNodes, NuiTree.Node({ text = bodyLine, is_body = true }, {}))
|
|
end
|
|
|
|
state.tree:set_nodes(newNoteTextNodes, "-" .. state.ACTIVE_NOTE)
|
|
|
|
state.tree:render()
|
|
local buf = vim.api.nvim_get_current_buf()
|
|
u.darken_metadata(buf, '')
|
|
vim.notify("Edited comment!", vim.log.levels.INFO)
|
|
end)
|
|
end)
|
|
end
|
|
|
|
return M
|