Skip to content

[pull] main from microsoft:main #1484

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
pull merged 1 commit into from
May 30, 2026
Merged

[pull] main from microsoft:main #1484

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: 5 additions & 3 deletions src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ export class StatusbarEntryItem extends Disposable {

class StatusBarCodiconLabel extends SimpleIconLabel {

private progressCodicon = renderIcon(syncing);
private progressCodicon: HTMLElement | undefined;

private currentText = '';
private currentShowProgress: boolean | 'loading' | 'syncing' = false;
Expand All @@ -300,7 +300,9 @@ class StatusBarCodiconLabel extends SimpleIconLabel {
set showProgress(showProgress: boolean | 'loading' | 'syncing') {
if (this.currentShowProgress !== showProgress) {
this.currentShowProgress = showProgress;
this.progressCodicon = renderIcon(showProgress === 'syncing' ? syncing : spinningLoading);
if (showProgress) {
this.progressCodicon = renderIcon(showProgress === 'syncing' ? syncing : spinningLoading);
}
this.text = this.currentText;
}
}
Expand All @@ -309,7 +311,7 @@ class StatusBarCodiconLabel extends SimpleIconLabel {

// Progress: insert progress codicon as first element as needed
// but keep it stable so that the animation does not reset
if (this.currentShowProgress) {
if (this.currentShowProgress && this.progressCodicon) {

// Append as needed
if (this.container.firstChild !== this.progressCodicon) {
Expand Down
Loading