Strict null check titlebarPart

mjbvz · mjbvz · commit 37732e9cedbb · 2019-03-05T13:01:27.000-08:00
diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
@@ -147,6 +147,7 @@
 		"./vs/workbench/browser/parts/statusbar/statusbar.ts",
 		"./vs/workbench/browser/parts/statusbar/statusbarPart.ts",
 		"./vs/workbench/browser/parts/titlebar/menubarControl.ts",
+		"./vs/workbench/browser/parts/titlebar/titlebarPart.ts",
 		"./vs/workbench/browser/parts/views/customView.ts",
 		"./vs/workbench/browser/parts/views/panelViewlet.ts",
 		"./vs/workbench/browser/parts/views/views.ts",
diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts
@@ -283,7 +283,7 @@ interface ISegment {
  * @param value string to which templating is applied
  * @param values the values of the templates to use
  */
-export function template(template: string, values: { [key: string]: string | ISeparator } = Object.create(null)): string {
+export function template(template: string, values: { [key: string]: string | ISeparator | null } = Object.create(null)): string {
 	const segments: ISegment[] = [];
 
 	let inVariable = false;
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -180,7 +180,7 @@ export class TitlebarPart extends Part implements ITitleService, ISerializableVi
 	}
 
 	private updateRepresentedFilename(): void {
-		const file = toResource(this.editorService.activeEditor, { supportSideBySide: true, filter: 'file' });
+		const file = toResource(this.editorService.activeEditor || null, { supportSideBySide: true, filter: 'file' });
 		const path = file ? file.fsPath : '';
 
 		// Apply to window
@@ -283,7 +283,7 @@ export class TitlebarPart extends Part implements ITitleService, ISerializableVi
 		// Compute folder resource
 		// Single Root Workspace: always the root single workspace in this case
 		// Otherwise: root folder of the currently active file if any
-		const folder = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER ? workspace.folders[0] : this.contextService.getWorkspaceFolder(toResource(editor, { supportSideBySide: true }));
+		const folder = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER ? workspace.folders[0] : this.contextService.getWorkspaceFolder(toResource(editor || null, { supportSideBySide: true })!);
 
 		// Variables
 		const activeEditorShort = editor ? editor.getTitle(Verbosity.SHORT) : '';
@@ -473,7 +473,7 @@ export class TitlebarPart extends Part implements ITitleService, ISerializableVi
 
 			const titleBackground = this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_BACKGROUND : TITLE_BAR_ACTIVE_BACKGROUND);
 			this.element.style.backgroundColor = titleBackground;
-			if (Color.fromHex(titleBackground).isLighter()) {
+			if (titleBackground && Color.fromHex(titleBackground).isLighter()) {
 				addClass(this.element, 'light');
 			} else {
 				removeClass(this.element, 'light');
@@ -582,7 +582,7 @@ export class TitlebarPart extends Part implements ITitleService, ISerializableVi
 			runAtThisOrScheduleAtNextAnimationFrame(() => this.adjustTitleMarginToCenter());
 
 			if (this.menubarPart) {
-				const menubarDimension = new Dimension(undefined, dimension.height);
+				const menubarDimension = new Dimension(0, dimension.height);
 				this.menubarPart.layout(menubarDimension);
 			}
 		}
@@ -597,7 +597,7 @@ export class TitlebarPart extends Part implements ITitleService, ISerializableVi
 			return super.layout(dim1);
 		}
 
-		const dimensions = new Dimension(dim1, dim2);
+		const dimensions = new Dimension(dim1, dim2!);
 		this.updateLayout(dimensions);
 
 		super.layout(dimensions);
