Strict null check activitybarActions

mjbvz · mjbvz · commit ee7580707008 · 2019-03-05T10:00:06.000-08:00
diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
@@ -103,6 +103,7 @@
 		"./vs/workbench/browser/labels.ts",
 		"./vs/workbench/browser/panel.ts",
 		"./vs/workbench/browser/part.ts",
+		"./vs/workbench/browser/parts/activitybar/activitybarActions.ts",
 		"./vs/workbench/browser/parts/compositeBarActions.ts",
 		"./vs/workbench/browser/parts/compositePart.ts",
 		"./vs/workbench/browser/parts/editor/baseEditor.ts",
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -199,14 +199,14 @@ export class SidebarPart extends CompositePart<Viewlet> implements ISerializable
 		this.hideActiveComposite();
 	}
 
-	openViewlet(id: string, focus?: boolean): Promise<IViewlet | null> {
-		if (this.getViewlet(id)) {
+	openViewlet(id: string | undefined, focus?: boolean): Promise<IViewlet | null> {
+		if (typeof id === 'string' && this.getViewlet(id)) {
 			return Promise.resolve(this.doOpenViewlet(id, focus));
 		}
 
 		return this.extensionService.whenInstalledExtensionsRegistered()
 			.then(() => {
-				if (this.getViewlet(id)) {
+				if (typeof id === 'string' && this.getViewlet(id)) {
 					return this.doOpenViewlet(id, focus);
 				}
 
diff --git a/src/vs/workbench/services/viewlet/browser/viewlet.ts b/src/vs/workbench/services/viewlet/browser/viewlet.ts
@@ -22,7 +22,7 @@ export interface IViewletService {
 	/**
 	 * Opens a viewlet with the given identifier and pass keyboard focus to it if specified.
 	 */
-	openViewlet(id: string, focus?: boolean): Promise<IViewlet | null>;
+	openViewlet(id: string | undefined, focus?: boolean): Promise<IViewlet | null>;
 
 	/**
 	 * Returns the current active viewlet or null if none.

Original file line number	Diff line number	Diff line change
`@@ -199,14 +199,14 @@ export class SidebarPart extends CompositePart<Viewlet> implements ISerializable`
`199`	`199`	`this.hideActiveComposite();`
`200`	`200`	`}`
`201`	`201`
`202`		`- openViewlet(id: string, focus?: boolean): Promise<IViewlet \| null> {`
`203`		`- if (this.getViewlet(id)) {`
	`202`	`+ openViewlet(id: string \| undefined, focus?: boolean): Promise<IViewlet \| null> {`
	`203`	`+ if (typeof id === 'string' && this.getViewlet(id)) {`
`204`	`204`	`return Promise.resolve(this.doOpenViewlet(id, focus));`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`return this.extensionService.whenInstalledExtensionsRegistered()`
`208`	`208`	`.then(() => {`
`209`		`- if (this.getViewlet(id)) {`
	`209`	`+ if (typeof id === 'string' && this.getViewlet(id)) {`
`210`	`210`	`return this.doOpenViewlet(id, focus);`
`211`	`211`	`}`
`212`	`212`