Strict null work for watermark

mjbvz · mjbvz · commit 8d3a399e1927 · 2019-02-13T14:20:40.000-08:00
diff --git a/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts b/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts
@@ -33,7 +33,7 @@ export interface KeybindingLabelOptions {
 export class KeybindingLabel {
 
 	private domNode: HTMLElement;
-	private keybinding: ResolvedKeybinding;
+	private keybinding: ResolvedKeybinding | undefined;
 	private matches: Matches | undefined;
 	private didEverRender: boolean;
 
@@ -47,7 +47,7 @@ export class KeybindingLabel {
 		return this.domNode;
 	}
 
-	set(keybinding: ResolvedKeybinding, matches?: Matches) {
+	set(keybinding: ResolvedKeybinding | undefined, matches?: Matches) {
 		if (this.didEverRender && this.keybinding === keybinding && KeybindingLabel.areSame(this.matches, matches)) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/watermark/electron-browser/watermark.ts b/src/vs/workbench/contrib/watermark/electron-browser/watermark.ts
@@ -146,6 +146,9 @@ export class WatermarkContribution implements IWorkbenchContribution {
 
 	private create(): void {
 		const container = this.partService.getContainer(Parts.EDITOR_PART);
+		if (!container) {
+			throw new Error('Could not find container');
+		}
 		container.classList.add('has-watermark');
 
 		this.watermark = $('.watermark');
@@ -176,7 +179,10 @@ export class WatermarkContribution implements IWorkbenchContribution {
 	private destroy(): void {
 		if (this.watermark) {
 			this.watermark.remove();
-			this.partService.getContainer(Parts.EDITOR_PART).classList.remove('has-watermark');
+			const container = this.partService.getContainer(Parts.EDITOR_PART);
+			if (container) {
+				container.classList.remove('has-watermark');
+			}
 			this.dispose();
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export interface KeybindingLabelOptions {`
`33`	`33`	`export class KeybindingLabel {`
`34`	`34`
`35`	`35`	`private domNode: HTMLElement;`
`36`		`- private keybinding: ResolvedKeybinding;`
	`36`	`+ private keybinding: ResolvedKeybinding \| undefined;`
`37`	`37`	`private matches: Matches \| undefined;`
`38`	`38`	`private didEverRender: boolean;`
`39`	`39`
`@@ -47,7 +47,7 @@ export class KeybindingLabel {`
`47`	`47`	`return this.domNode;`
`48`	`48`	`}`
`49`	`49`
`50`		`- set(keybinding: ResolvedKeybinding, matches?: Matches) {`
	`50`	`+ set(keybinding: ResolvedKeybinding \| undefined, matches?: Matches) {`
`51`	`51`	`if (this.didEverRender && this.keybinding === keybinding && KeybindingLabel.areSame(this.matches, matches)) {`
`52`	`52`	`return;`
`53`	`53`	`}`