Skip to content

fix: improve indication of resolved threads and drafts #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2024
Merged

fix: improve indication of resolved threads and drafts #442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lua/gitlab/actions/discussions/winbar.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,12 @@ local add_drafts_and_resolvable = function(
if resolvable_count ~= 0 then
base_title = base_title .. M.get_resolved_text(focused, resolved_count, resolvable_count)
end
if drafts_count ~= 0 then
base_title = base_title .. M.get_drafts_text(base_title, drafts_count, focused)
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 .. M.get_drafts_text(base_title, drafts_count, focused)
end
return base_title
end

Expand Down Expand Up @@ -217,7 +217,7 @@ 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/%d%s", resolved_count, resolvable_count, text)
return " " .. string.format("%d%s/%d", resolved_count, text, resolvable_count)
end

M.get_drafts_text = function(base_title, drafts_count, focused)
Expand Down
Loading