Release (#440)
* Feat: Enable sorting discussions by original comment (#422) * Feat: Improve popup UX (#426) * Feat: Automatically update MR summary details (#427) * Feat: Show update progress in winbar (#432) * Feat: Abbreviate winbar (#439) * Fix: Note Creation Bug (#441) * Fix: Checking whether comment can be created (#434) * Fix: Syntax in discussion tree (#433) * fix: improve indication of resolved threads and drafts (#442) * Docs: Various minor improvements (#445) --------- Co-authored-by: Jakub F. Bortlík <jakub.bortlik@proton.me>
This commit is contained in:
Harrison (Harry) Cramer
committed by
GitHub
GitHub
parent
be027331e1
commit
495e64c8bc
@@ -54,7 +54,19 @@ local get_data = function(nodes)
|
||||
return total_resolvable, total_resolved, total_non_resolvable
|
||||
end
|
||||
|
||||
local spinner_index = 0
|
||||
state.discussion_tree.last_updated = nil
|
||||
|
||||
local function content()
|
||||
local updated
|
||||
if state.discussion_tree.last_updated then
|
||||
local last_update = tostring(os.date("!%Y-%m-%dT%H:%M:%S", state.discussion_tree.last_updated))
|
||||
updated = u.time_since(last_update) .. " ⟳"
|
||||
else
|
||||
spinner_index = (spinner_index % #state.settings.discussion_tree.spinner_chars) + 1
|
||||
updated = state.settings.discussion_tree.spinner_chars[spinner_index]
|
||||
end
|
||||
|
||||
local resolvable_discussions, resolved_discussions, non_resolvable_discussions =
|
||||
get_data(state.DISCUSSION_DATA.discussions)
|
||||
local resolvable_notes, resolved_notes, non_resolvable_notes = get_data(state.DISCUSSION_DATA.unlinked_discussions)
|
||||
@@ -82,9 +94,10 @@ local function content()
|
||||
resolved_notes = resolved_notes,
|
||||
non_resolvable_notes = non_resolvable_notes,
|
||||
help_keymap = state.settings.keymaps.help,
|
||||
updated = updated,
|
||||
}
|
||||
|
||||
return M.make_winbar(t)
|
||||
return state.settings.discussion_tree.winbar and state.settings.discussion_tree.winbar(t) or M.make_winbar(t)
|
||||
end
|
||||
|
||||
---This function updates the winbar
|
||||
@@ -108,7 +121,7 @@ M.update_winbar = function()
|
||||
end
|
||||
|
||||
local function get_connector(base_title)
|
||||
return string.match(base_title, "%($") and "" or "; "
|
||||
return string.match(base_title, "%($") and "" or " "
|
||||
end
|
||||
|
||||
---Builds the title string for both sections, using the count of resolvable and draft nodes
|
||||
@@ -116,84 +129,128 @@ end
|
||||
---@param resolvable_count integer
|
||||
---@param resolved_count integer
|
||||
---@param drafts_count integer
|
||||
---@param focused boolean
|
||||
---@return string
|
||||
local add_drafts_and_resolvable = function(
|
||||
base_title,
|
||||
resolvable_count,
|
||||
resolved_count,
|
||||
drafts_count,
|
||||
non_resolvable_count
|
||||
non_resolvable_count,
|
||||
focused
|
||||
)
|
||||
if resolvable_count == 0 and drafts_count == 0 and non_resolvable_count == 0 then
|
||||
return base_title
|
||||
end
|
||||
base_title = base_title .. " ("
|
||||
if non_resolvable_count ~= 0 then
|
||||
base_title = base_title .. u.pluralize(non_resolvable_count, "comment")
|
||||
end
|
||||
if resolvable_count ~= 0 then
|
||||
base_title = base_title
|
||||
.. get_connector(base_title)
|
||||
.. string.format("%d/%s", resolved_count, u.pluralize(resolvable_count, "thread"))
|
||||
base_title = base_title .. M.get_resolved_text(focused, resolved_count, resolvable_count)
|
||||
end
|
||||
if non_resolvable_count ~= 0 then
|
||||
base_title = base_title .. M.get_nonresolveable_text(base_title, non_resolvable_count, focused)
|
||||
end
|
||||
if drafts_count ~= 0 then
|
||||
base_title = base_title .. get_connector(base_title) .. u.pluralize(drafts_count, "draft")
|
||||
base_title = base_title .. M.get_drafts_text(base_title, drafts_count, focused)
|
||||
end
|
||||
base_title = base_title .. ")"
|
||||
return base_title
|
||||
end
|
||||
|
||||
---@param t WinbarTable
|
||||
M.make_winbar = function(t)
|
||||
local discussion_title = add_drafts_and_resolvable(
|
||||
"Inline Comments",
|
||||
local discussions_focused = M.current_view_type == "discussions"
|
||||
local discussion_text = add_drafts_and_resolvable(
|
||||
"Inline Comments:",
|
||||
t.resolvable_discussions,
|
||||
t.resolved_discussions,
|
||||
t.inline_draft_notes,
|
||||
t.non_resolvable_discussions
|
||||
t.non_resolvable_discussions,
|
||||
discussions_focused
|
||||
)
|
||||
local notes_title = add_drafts_and_resolvable(
|
||||
"Notes",
|
||||
local notes_text = add_drafts_and_resolvable(
|
||||
"Notes:",
|
||||
t.resolvable_notes,
|
||||
t.resolved_notes,
|
||||
t.unlinked_draft_notes,
|
||||
t.non_resolvable_notes
|
||||
t.non_resolvable_notes,
|
||||
not discussions_focused
|
||||
)
|
||||
|
||||
-- Colorize the active tab
|
||||
if M.current_view_type == "discussions" then
|
||||
discussion_title = "%#Text#" .. discussion_title
|
||||
notes_title = "%#Comment#" .. notes_title
|
||||
elseif M.current_view_type == "notes" then
|
||||
discussion_title = "%#Comment#" .. discussion_title
|
||||
notes_title = "%#Text#" .. notes_title
|
||||
if discussions_focused then
|
||||
discussion_text = "%#Text#" .. discussion_text
|
||||
notes_text = "%#Comment#" .. notes_text
|
||||
else
|
||||
discussion_text = "%#Comment#" .. discussion_text
|
||||
notes_text = "%#Text#" .. notes_text
|
||||
end
|
||||
|
||||
local sort_method = M.get_sort_method()
|
||||
local mode = M.get_mode()
|
||||
|
||||
-- Join everything together and return it
|
||||
local separator = "%#Comment#|"
|
||||
local end_section = "%="
|
||||
local updated = "%#Text#" .. t.updated
|
||||
local help = "%#Comment#Help: " .. (t.help_keymap and t.help_keymap:gsub(" ", "<space>") .. " " or "unmapped")
|
||||
return string.format(
|
||||
" %s %s %s %s %s %s %s",
|
||||
discussion_title,
|
||||
" %s %s %s %s %s %s %s %s %s %s %s",
|
||||
discussion_text,
|
||||
separator,
|
||||
notes_title,
|
||||
notes_text,
|
||||
end_section,
|
||||
updated,
|
||||
separator,
|
||||
sort_method,
|
||||
separator,
|
||||
mode,
|
||||
separator,
|
||||
help
|
||||
)
|
||||
end
|
||||
|
||||
---Returns a string for the winbar indicating the sort method
|
||||
---@return string
|
||||
M.get_sort_method = function()
|
||||
local sort_method = state.settings.discussion_tree.sort_by == "original_comment" and "↓ by thread" or "↑ by reply"
|
||||
return "%#GitlabSortMethod#" .. sort_method .. "%#Comment#"
|
||||
end
|
||||
|
||||
M.get_resolved_text = function(focused, resolved_count, resolvable_count)
|
||||
local text = focused and ("%#GitlabResolved#" .. state.settings.discussion_tree.resolved .. "%#Text#")
|
||||
or state.settings.discussion_tree.resolved
|
||||
return " " .. string.format("%d%s/%d", resolved_count, text, resolvable_count)
|
||||
end
|
||||
|
||||
M.get_drafts_text = function(base_title, drafts_count, focused)
|
||||
return get_connector(base_title)
|
||||
.. string.format(
|
||||
"%d%s",
|
||||
drafts_count,
|
||||
(
|
||||
focused and ("%#GitlabDraft#" .. state.settings.discussion_tree.draft .. "%#Text#")
|
||||
or state.settings.discussion_tree.draft
|
||||
)
|
||||
)
|
||||
end
|
||||
|
||||
M.get_nonresolveable_text = function(base_title, non_resolvable_count, focused)
|
||||
return get_connector(base_title)
|
||||
.. string.format(
|
||||
"%d%s",
|
||||
non_resolvable_count,
|
||||
(
|
||||
focused and ("%#GitlabUnlinked#" .. state.settings.discussion_tree.unlinked .. "%#Text#")
|
||||
or state.settings.discussion_tree.unlinked
|
||||
)
|
||||
)
|
||||
end
|
||||
|
||||
---Returns a string for the winbar indicating the mode type, live or draft
|
||||
---@return string
|
||||
M.get_mode = function()
|
||||
if state.settings.discussion_tree.draft_mode then
|
||||
return "%#DiagnosticWarn#Draft Mode"
|
||||
return "%#GitlabDraftMode#Draft"
|
||||
else
|
||||
return "%#DiagnosticOK#Live Mode"
|
||||
return "%#GitlabLiveMode#Live"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -215,4 +272,8 @@ M.switch_view_type = function(override)
|
||||
M.update_winbar()
|
||||
end
|
||||
|
||||
-- Set up a timer to update the winbar periodically
|
||||
local timer = vim.uv.new_timer()
|
||||
timer:start(0, 100, vim.schedule_wrap(M.update_winbar))
|
||||
|
||||
return M
|
||||
|
||||
Reference in New Issue
Block a user