Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-02 08:15:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #305288 from microsoft/osortega/unnecessary-mammal

Browse Source 
Sessions: progress icons should override PR icons
This commit is contained in:
Osvaldo Ortega
2026-03-26 16:04:36 -07:00
committed by GitHub
parent 9337969f0e 6288d6d9d6
commit 4d86eb19fa
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
View File

@@ -234,14 +234,13 @@ class SessionItemRenderer implements ITreeRenderer<SessionListItem, FuzzyScore,
const isArchived = element.isArchived.read(reader);
const pullRequest = element.pullRequest.read(reader);
DOM.clearNode(template.iconContainer);
const hasPrIcon = !!pullRequest;
const icon = pullRequest?.icon ? pullRequest.icon : this.getStatusIcon(sessionStatus, isRead, isArchived);
const icon = this.getStatusIcon(sessionStatus, isRead, isArchived, pullRequest?.icon);
const iconSpan = DOM.append(template.iconContainer, $(`span${ThemeIcon.asCSSSelector(icon)}`));
iconSpan.style.color = icon.color ? asCssVariable(icon.color.id) : '';
template.iconContainer.classList.toggle('session-icon-pulse', !hasPrIcon && sessionStatus === SessionStatus.NeedsInput);
template.iconContainer.classList.toggle('session-icon-active', !hasPrIcon && sessionStatus === SessionStatus.InProgress);
template.iconContainer.classList.toggle('session-icon-error', !hasPrIcon && sessionStatus === SessionStatus.Error);
template.iconContainer.classList.toggle('session-icon-unread', !hasPrIcon && !isRead && !isArchived && sessionStatus !== SessionStatus.InProgress && sessionStatus !== SessionStatus.NeedsInput && sessionStatus !== SessionStatus.Error);
template.iconContainer.classList.toggle('session-icon-pulse', sessionStatus === SessionStatus.NeedsInput);
template.iconContainer.classList.toggle('session-icon-active', sessionStatus === SessionStatus.InProgress);
template.iconContainer.classList.toggle('session-icon-error', sessionStatus === SessionStatus.Error);
template.iconContainer.classList.toggle('session-icon-unread', !isRead && !isArchived && sessionStatus !== SessionStatus.InProgress && sessionStatus !== SessionStatus.NeedsInput && sessionStatus !== SessionStatus.Error);
}));
// Title — reactive
@@ -408,12 +407,16 @@ class SessionItemRenderer implements ITreeRenderer<SessionListItem, FuzzyScore,
}));
}
private getStatusIcon(status: SessionStatus, isRead: boolean, isArchived: boolean): ThemeIcon {
private getStatusIcon(status: SessionStatus, isRead: boolean, isArchived: boolean, pullRequestIcon?: ThemeIcon): ThemeIcon {
switch (status) {
case SessionStatus.InProgress: return Codicon.sessionInProgress;
case SessionStatus.NeedsInput: return Codicon.circleFilled;
case SessionStatus.Error: return Codicon.error;
default:
if (pullRequestIcon) {
return pullRequestIcon;
}
if (!isRead && !isArchived) {
return Codicon.circleFilled;
}