From c899a09a85fabc40e56f63cd1aac24739768ebc9 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 11 Mar 2019 17:40:45 -0700 Subject: [PATCH] Strict null check extHostStatusBar - Priority can be undefined. Update public api to match this - We also use an undefined `extensionId`. Update typings for this --- src/tsconfig.strictNullChecks.json | 1 + src/vs/vscode.d.ts | 2 +- src/vs/workbench/api/node/extHost.protocol.ts | 2 +- src/vs/workbench/api/node/extHostStatusBar.ts | 10 +++++----- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json index 4bcb7c00152..268b5259ea7 100644 --- a/src/tsconfig.strictNullChecks.json +++ b/src/tsconfig.strictNullChecks.json @@ -113,6 +113,7 @@ "./vs/workbench/api/node/extHostQuickOpen.ts", "./vs/workbench/api/node/extHostSCM.ts", "./vs/workbench/api/node/extHostSearch.ts", + "./vs/workbench/api/node/extHostStatusBar.ts", "./vs/workbench/api/node/extHostStorage.ts", "./vs/workbench/api/node/extHostTextEditor.ts", "./vs/workbench/api/node/extHostTextEditors.ts", diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 1b773f2da31..4c0ad9937a9 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -4517,7 +4517,7 @@ declare module 'vscode' { * The priority of this item. Higher value means the item should * be shown more to the left. */ - readonly priority: number; + readonly priority?: number; /** * The text to show for the entry. You can embed icons in the text by leveraging the syntax: diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 00eb6e73112..15a16ca11cc 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -466,7 +466,7 @@ export interface MainThreadQuickOpenShape extends IDisposable { } export interface MainThreadStatusBarShape extends IDisposable { - $setEntry(id: number, extensionId: ExtensionIdentifier, text: string, tooltip: string, command: string, color: string | ThemeColor, alignment: MainThreadStatusBarAlignment, priority: number): void; + $setEntry(id: number, extensionId: ExtensionIdentifier | undefined, text: string, tooltip: string, command: string, color: string | ThemeColor, alignment: MainThreadStatusBarAlignment, priority: number | undefined): void; $dispose(id: number): void; } diff --git a/src/vs/workbench/api/node/extHostStatusBar.ts b/src/vs/workbench/api/node/extHostStatusBar.ts index cd6c2066146..bc7215c0fe9 100644 --- a/src/vs/workbench/api/node/extHostStatusBar.ts +++ b/src/vs/workbench/api/node/extHostStatusBar.ts @@ -14,7 +14,7 @@ export class ExtHostStatusBarEntry implements StatusBarItem { private _id: number; private _alignment: number; - private _priority: number; + private _priority?: number; private _disposed: boolean; private _visible: boolean; @@ -26,9 +26,9 @@ export class ExtHostStatusBarEntry implements StatusBarItem { private _timeoutHandle: any; private _proxy: MainThreadStatusBarShape; - private _extensionId: ExtensionIdentifier; + private _extensionId?: ExtensionIdentifier; - constructor(proxy: MainThreadStatusBarShape, extensionId: ExtensionIdentifier, alignment: ExtHostStatusBarAlignment = ExtHostStatusBarAlignment.Left, priority?: number) { + constructor(proxy: MainThreadStatusBarShape, extensionId: ExtensionIdentifier | undefined, alignment: ExtHostStatusBarAlignment = ExtHostStatusBarAlignment.Left, priority?: number) { this._id = ExtHostStatusBarEntry.ID_GEN++; this._proxy = proxy; this._alignment = alignment; @@ -44,7 +44,7 @@ export class ExtHostStatusBarEntry implements StatusBarItem { return this._alignment; } - public get priority(): number { + public get priority(): number | undefined { return this._priority; } @@ -167,7 +167,7 @@ export class ExtHostStatusBar { this._statusMessage = new StatusBarMessage(this); } - createStatusBarEntry(extensionId: ExtensionIdentifier, alignment?: ExtHostStatusBarAlignment, priority?: number): StatusBarItem { + createStatusBarEntry(extensionId: ExtensionIdentifier | undefined, alignment?: ExtHostStatusBarAlignment, priority?: number): StatusBarItem { return new ExtHostStatusBarEntry(this._proxy, extensionId, alignment, priority); }