Skip to content

SCM - first colored badge is being rendered independently #230022

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
lszomoru merged 1 commit into from
Sep 27, 2024
+16 −6
Merged

SCM - first colored badge is being rendered independently #230022

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
22 changes: 16 additions & 6 deletions src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,17 +365,27 @@ class HistoryItemRenderer implements ITreeRenderer<SCMHistoryItemViewModelTreeEl
private _renderBadges(historyItem: ISCMHistoryItem, templateData: HistoryItemTemplate): void {
templateData.elementDisposables.add(autorun(reader => {
const labelConfig = this._badgesConfig.read(reader);
const firstColoredRef = historyItem.references?.find(ref => ref.color);

templateData.labelContainer.textContent = '';

const references = historyItem.references ?
historyItem.references.slice(0) : [];

// If the first reference is colored, we render it
// separately since we have to show the description
// for the first colored reference.
if (references.length > 0 && references[0].color) {
this._renderBadge(references[0], true, templateData);

// Remove the rendered reference from the collection
references.splice(0, 1);
}

// Group history item references by color
const historyItemRefsByColor = groupBy2(
(historyItem.references ?? []),
ref => ref.color ? ref.color : '');
const historyItemRefsByColor = groupBy2(references, ref => ref.color ? ref.color : '');

for (const [key, historyItemRefs] of Object.entries(historyItemRefsByColor)) {
// Skip badges with no color
// If needed skip badges with no color
if (key === '' && labelConfig !== 'all') {
continue;
}
Expand All @@ -387,7 +397,7 @@ class HistoryItemRenderer implements ITreeRenderer<SCMHistoryItemViewModelTreeEl
continue;
}

this._renderBadge(historyItemRefs[0], historyItemRefs[0] === firstColoredRef, templateData);
this._renderBadge(historyItemRefs[0], false, templateData);
}
}
}));
Expand Down