mark contributed status bar item as visible

Author: jrieken

src/vs/workbench/api/browser/mainThreadStatusBar.ts

@@ -28,7 +28,13 @@ export class MainThreadStatusBar implements MainThreadStatusBarShape {
 
 	$setEntry(entryId: string, id: string, extensionId: string | undefined, name: string, text: string, tooltip: IMarkdownString | string | undefined, command: Command | undefined, color: string | ThemeColor | undefined, backgroundColor: string | ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): void {
 		const dispo = this.statusbarService.setOrUpdateEntry(entryId, id, extensionId, name, text, tooltip, command, color, backgroundColor, alignLeft, priority, accessibilityInformation);
-		this.entries.set(entryId, dispo);
+		if (!this.entries.has(entryId)) {
+			this.entries.set(entryId, dispo);
+		}
+	}
+
+	async $hasEntry(entryId: string): Promise<boolean> {
+		return this.statusbarService.hasEntry(entryId);
 	}
 
 	$dispose(entryId: string) {

src/vs/workbench/api/browser/statusBarExtensionPoint.ts

@@ -29,18 +29,18 @@ export interface IExtensionStatusBarItemService {
 	readonly _serviceBrand: undefined;
 
 	setOrUpdateEntry(id: string, statusId: string, extensionId: string | undefined, name: string, text: string, tooltip: IMarkdownString | string | undefined, command: Command | undefined, color: string | ThemeColor | undefined, backgroundColor: string | ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): IDisposable;
+
+	hasEntry(id: string): boolean;
 }
 
 
 class ExtensionStatusBarItemService implements IExtensionStatusBarItemService {
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly entries: Map<string, { accessor: IStatusbarEntryAccessor; alignment: MainThreadStatusBarAlignment; priority: number }> = new Map();
+	private readonly _entries: Map<string, { accessor: IStatusbarEntryAccessor; alignment: MainThreadStatusBarAlignment; priority: number }> = new Map();
 
-	constructor(
-		@IStatusbarService private readonly _statusbarService: IStatusbarService
-	) { }
+	constructor(@IStatusbarService private readonly _statusbarService: IStatusbarService) { }
 
 	setOrUpdateEntry(entryId: string, id: string, extensionId: string | undefined, name: string, text: string, tooltip: IMarkdownString | string | undefined, command: Command | undefined, color: string | ThemeColor | undefined, backgroundColor: string | ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): IDisposable {
 		// if there are icons in the text use the tooltip for the aria label
@@ -65,7 +65,7 @@ class ExtensionStatusBarItemService implements IExtensionStatusBarItemService {
 		let alignment = alignLeft ? StatusbarAlignment.LEFT : StatusbarAlignment.RIGHT;
 
 		// alignment and priority can only be set once (at creation time)
-		const existingEntry = this.entries.get(entryId);
+		const existingEntry = this._entries.get(entryId);
 		if (existingEntry) {
 			alignment = existingEntry.alignment;
 			priority = existingEntry.priority;
@@ -85,7 +85,7 @@ class ExtensionStatusBarItemService implements IExtensionStatusBarItemService {
 				entryPriority = priority;
 			}
 
-			this.entries.set(entryId, {
+			this._entries.set(entryId, {
 				accessor: this._statusbarService.addEntry(entry, id, alignment, entryPriority),
 				alignment,
 				priority
@@ -97,13 +97,17 @@ class ExtensionStatusBarItemService implements IExtensionStatusBarItemService {
 		}
 
 		return toDisposable(() => {
-			const entry = this.entries.get(entryId);
+			const entry = this._entries.get(entryId);
 			if (entry) {
 				entry.accessor.dispose();
-				this.entries.delete(entryId);
+				this._entries.delete(entryId);
 			}
 		});
 	}
+
+	hasEntry(id: string): boolean {
+		return this._entries.has(id);
+	}
 }
 
 registerSingleton(IExtensionStatusBarItemService, ExtensionStatusBarItemService, InstantiationType.Delayed);

src/vs/workbench/api/common/extHost.protocol.ts

@@ -609,6 +609,7 @@ export interface MainThreadQuickOpenShape extends IDisposable {
 }
 
 export interface MainThreadStatusBarShape extends IDisposable {
+	$hasEntry(id: string): Promise<boolean>;
 	$setEntry(id: string, statusId: string, extensionId: string | undefined, statusName: string, text: string, tooltip: IMarkdownString | string | undefined, command: ICommandDto | undefined, color: string | ThemeColor | undefined, backgroundColor: string | ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): void;
 	$dispose(id: string): void;
 }

src/vs/workbench/api/common/extHostStatusBar.ts

@@ -36,7 +36,7 @@ export class ExtHostStatusBarEntry implements vscode.StatusBarItem {
 	private _priority?: number;
 
 	private _disposed: boolean = false;
-	private _visible: boolean = false;
+	private _visible?: boolean;
 
 	private _text: string = '';
 	private _tooltip?: string | vscode.MarkdownString;
@@ -59,9 +59,19 @@ export class ExtHostStatusBarEntry implements vscode.StatusBarItem {
 		this.#proxy = proxy;
 		this.#commands = commands;
 
-		this._entryId = id && extension
-			? `${ExtensionIdentifier.toKey(extension.identifier)}.${id}`
-			: String(ExtHostStatusBarEntry.ID_GEN++);
+		if (id && extension) {
+			this._entryId = `${ExtensionIdentifier.toKey(extension.identifier)}.${id}`;
+			proxy.$hasEntry(this._entryId).then(exits => {
+				if (exits && this._visible === undefined) {
+					// mark new item as visible if it already exists
+					// this can only happen when an item was contributed by an extension
+					this._visible = true;
+					this.update();
+				}
+			});
+		} else {
+			this._entryId = String(ExtHostStatusBarEntry.ID_GEN++);
+		}
 		this._extension = extension;
 
 		this._id = id;
@@ -259,8 +269,8 @@ export class ExtHostStatusBarEntry implements vscode.StatusBarItem {
 
 class StatusBarMessage {
 
-	private _item: vscode.StatusBarItem;
-	private _messages: { message: string }[] = [];
+	private readonly _item: vscode.StatusBarItem;
+	private readonly _messages: { message: string }[] = [];
 
 	constructor(statusBar: ExtHostStatusBar) {
 		this._item = statusBar.createStatusBarEntry(undefined, 'status.extensionMessage', ExtHostStatusBarAlignment.Left, Number.MIN_VALUE);
@@ -300,7 +310,7 @@ export class ExtHostStatusBar {
 
 	private readonly _proxy: MainThreadStatusBarShape;
 	private readonly _commands: CommandsConverter;
-	private _statusMessage: StatusBarMessage;
+	private readonly _statusMessage: StatusBarMessage;
 
 	constructor(mainContext: IMainContext, commands: CommandsConverter) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadStatusBar);