Skip to content

fix(pr/issue): handle trailing accumulated timeline events #1166

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
Sep 21, 2025
+11 −6
Merged

fix(pr/issue): handle trailing accumulated timeline events #1166

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
17 changes: 11 additions & 6 deletions lua/octo/model/octo-buffer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,33 +211,37 @@ function OctoBuffer:render_issue()
--- labeled/unlabeled events or subissues events are rendered
table.insert(timeline_nodes, {})

for _, item in ipairs(timeline_nodes) do
if item.__typename ~= "LabeledEvent" and #unrendered_labeled_events > 0 then
---@param item? octo.PullRequestTimelineItem|octo.IssueTimelineItem
local function render_accumulated_events(item)
if (not item or item.__typename ~= "LabeledEvent") and #unrendered_labeled_events > 0 then
writers.write_labeled_events(self.bufnr, unrendered_labeled_events, "added")
unrendered_labeled_events = {}
prev_is_event = true
end
if item.__typename ~= "UnlabeledEvent" and #unrendered_unlabeled_events > 0 then
if (not item or item.__typename ~= "UnlabeledEvent") and #unrendered_unlabeled_events > 0 then
writers.write_labeled_events(self.bufnr, unrendered_unlabeled_events, "removed")
unrendered_unlabeled_events = {}
prev_is_event = true
end
if item.__typename ~= "SubIssueAddedEvent" and #unrendered_subissue_added_events > 0 then
if (not item or item.__typename ~= "SubIssueAddedEvent") and #unrendered_subissue_added_events > 0 then
writers.write_subissue_events(self.bufnr, unrendered_subissue_added_events, "added")
unrendered_subissue_added_events = {}
prev_is_event = true
end
if item.__typename ~= "SubIssueRemovedEvent" and #unrendered_subissue_removed_events > 0 then
if (not item or item.__typename ~= "SubIssueRemovedEvent") and #unrendered_subissue_removed_events > 0 then
writers.write_subissue_events(self.bufnr, unrendered_subissue_removed_events, "removed")
unrendered_subissue_removed_events = {}
prev_is_event = true
end
if item.__typename ~= "PullRequestCommit" and #commits > 0 then
if (not item or item.__typename ~= "PullRequestCommit") and #commits > 0 then
writers.write_commits(self.bufnr, commits)
commits = {}
prev_is_event = true
end
end

for _, item in ipairs(timeline_nodes) do
render_accumulated_events(item)
if item.__typename == "IssueComment" then
if prev_is_event then
writers.write_block(self.bufnr, { "" })
Expand Down Expand Up @@ -351,6 +355,7 @@ function OctoBuffer:render_issue()
prev_is_event = true
end
end
render_accumulated_events()

if prev_is_event then
writers.write_block(self.bufnr, { "" })
Expand Down