Strict null check sidebarPart

mjbvz · mjbvz · commit e053ead5e7a3 · 2019-01-08T14:57:15.000-08:00
diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
@@ -548,6 +548,7 @@
 		"./vs/workbench/browser/parts/quickinput/quickInputBox.ts",
 		"./vs/workbench/browser/parts/quickinput/quickInputUtils.ts",
 		"./vs/workbench/browser/parts/quickopen/quickopen.ts",
+		"./vs/workbench/browser/parts/sidebar/sidebarPart.ts",
 		"./vs/workbench/browser/parts/statusbar/statusbar.ts",
 		"./vs/workbench/browser/parts/statusbar/statusbarPart.ts",
 		"./vs/workbench/browser/parts/views/panelViewlet.ts",
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -175,7 +175,7 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi
 		}
 	}
 
-	openViewlet(id: string, focus?: boolean): Promise<IViewlet> {
+	openViewlet(id: string, focus?: boolean): Promise<IViewlet | null> {
 		if (this.getViewlet(id)) {
 			return Promise.resolve(this.doOpenViewlet(id, focus));
 		}
@@ -195,7 +195,7 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi
 
 	getAllViewlets(): ViewletDescriptor[] {
 		return this.viewletRegistry.getViewlets()
-			.sort((v1, v2) => v1.order - v2.order);
+			.sort((v1, v2) => v1.order! - v2.order!);
 	}
 
 	getDefaultViewletId(): string {
@@ -206,7 +206,7 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi
 		return this.getViewlets().filter(viewlet => viewlet.id === id)[0];
 	}
 
-	private doOpenViewlet(id: string, focus?: boolean): Viewlet {
+	private doOpenViewlet(id: string, focus?: boolean): Viewlet | null {
 		if (this.blockOpeningViewlet) {
 			return null; // Workaround against a potential race condition
 		}
diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts
@@ -768,7 +768,8 @@ export abstract class BaseNavigationAction extends Action {
 
 		const activeViewletId = this.viewletService.getActiveViewlet().getId();
 
-		return this.viewletService.openViewlet(activeViewletId, true);
+		return this.viewletService.openViewlet(activeViewletId, true)
+			.then(value => value === null ? false : value);
 	}
 
 	protected navigateAcrossEditorGroup(direction: GroupDirection): boolean {
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>;
+	openViewlet(id: string, focus?: boolean): Promise<IViewlet | null>;
 
 	/**
 	 * Returns the current active viewlet or null if none.

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`
`178`		`- openViewlet(id: string, focus?: boolean): Promise<IViewlet> {`
	`178`	`+ openViewlet(id: string, focus?: boolean): Promise<IViewlet \| null> {`
`179`	`179`	`if (this.getViewlet(id)) {`
`180`	`180`	`return Promise.resolve(this.doOpenViewlet(id, focus));`
`181`	`181`	`}`
`@@ -195,7 +195,7 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi`
`195`	`195`
`196`	`196`	`getAllViewlets(): ViewletDescriptor[] {`
`197`	`197`	`return this.viewletRegistry.getViewlets()`
`198`		`- .sort((v1, v2) => v1.order - v2.order);`
	`198`	`+ .sort((v1, v2) => v1.order! - v2.order!);`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`getDefaultViewletId(): string {`
`@@ -206,7 +206,7 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi`
`206`	`206`	`return this.getViewlets().filter(viewlet => viewlet.id === id)[0];`
`207`	`207`	`}`
`208`	`208`
`209`		`- private doOpenViewlet(id: string, focus?: boolean): Viewlet {`
	`209`	`+ private doOpenViewlet(id: string, focus?: boolean): Viewlet \| null {`
`210`	`210`	`if (this.blockOpeningViewlet) {`
`211`	`211`	`return null; // Workaround against a potential race condition`
`212`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,8 @@ export abstract class BaseNavigationAction extends Action {`
`768`	`768`
`769`	`769`	`const activeViewletId = this.viewletService.getActiveViewlet().getId();`
`770`	`770`
`771`		`- return this.viewletService.openViewlet(activeViewletId, true);`
	`771`	`+ return this.viewletService.openViewlet(activeViewletId, true)`
	`772`	`+ .then(value => value === null ? false : value);`
`772`	`773`	`}`
`773`	`774`
`774`	`775`	`protected navigateAcrossEditorGroup(direction: GroupDirection): boolean {`