Fixing strict-null-checks

toumorokoshi · toumorokoshi · commit d5df66ae7995 · 2019-01-18T07:08:31.000-08:00
diff --git a/src/vs/base/common/keyCodes.ts b/src/vs/base/common/keyCodes.ts
@@ -517,7 +517,10 @@ export class ChordKeybinding {
 		return hashCodes.join(';');
 	}
 
-	public equals(other: ChordKeybinding): boolean {
+	public equals(other: ChordKeybinding | null): boolean {
+		if (other === null) {
+			return false;
+		}
 		if (this.parts.length !== other.parts.length) {
 			return false;
 		}
diff --git a/src/vs/base/parts/tree/browser/treeDefaults.ts b/src/vs/base/parts/tree/browser/treeDefaults.ts
@@ -49,7 +49,7 @@ export interface IControllerOptions {
 }
 
 interface IKeybindingDispatcherItem {
-	keybinding: Keybinding;
+	keybinding: Keybinding | null;
 	callback: IKeyBindingCallback;
 }
 
@@ -63,9 +63,11 @@ export class KeybindingDispatcher {
 
 	public has(keybinding: KeyCode): boolean {
 		let target = createKeybinding(keybinding, platform.OS);
-		for (const a of this._arr) {
-			if (target.equals(a.keybinding)) {
-				return true;
+		if (target !== null) {
+			for (const a of this._arr) {
+				if (target.equals(a.keybinding)) {
+					return true;
+				}
 			}
 		}
 		return false;
diff --git a/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts b/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts
@@ -346,21 +346,22 @@ suite('KeybindingResolver', () => {
 		let testResolve = (ctx: IContext, _expectedKey: number, commandId: string) => {
 			const expectedKey = createKeybinding(_expectedKey, OS)!;
 
-			let previousPart = null;
+			let previousPart: (string | null) = null;
 			for (let i = 0, len = expectedKey.parts.length; i < len; i++) {
 				let part = getDispatchStr(expectedKey.parts[i]);
 				let result = resolver.resolve(ctx, previousPart, part);
-				assert.ok(result !== null, `Enters chord for ${commandId} at part ${i}`);
 				if (i === len - 1) {
 					// if it's the final part, then we should find a valid command,
 					// and there should not be a chord.
-					assert.equal(result.commandId, commandId, `Enters chord for ${commandId} at part ${i}`);
-					assert.equal(result.enterChord, false, `Enters chord for ${commandId} at part ${i}`);
+					assert.ok(result !== null, `Enters chord for ${commandId} at part ${i}`);
+					assert.equal(result!.commandId, commandId, `Enters chord for ${commandId} at part ${i}`);
+					assert.equal(result!.enterChord, false, `Enters chord for ${commandId} at part ${i}`);
 				} else {
 					// if it's not the final part, then we should not find a valid command,
 					// and there should be a chord.
-					assert.equal(result.commandId, null, `Enters chord for ${commandId} at part ${i}`);
-					assert.equal(result.enterChord, true, `Enters chord for ${commandId} at part ${i}`);
+					assert.ok(result !== null, `Enters chord for ${commandId} at part ${i}`);
+					assert.equal(result!.commandId, null, `Enters chord for ${commandId} at part ${i}`);
+					assert.equal(result!.enterChord, true, `Enters chord for ${commandId} at part ${i}`);
 				}
 				previousPart = part;
 			}
diff --git a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
@@ -171,7 +171,7 @@ export class NativeResolvedKeybinding extends ResolvedKeybinding {
 	}
 
 	public getDispatchParts(): (string | null)[] {
-		let dispatchParts = [];
+		let dispatchParts: (string | null)[] = [];
 		for (let part of this._parts) {
 			dispatchParts.push(part ? this._mapper.getDispatchStrForScanCodeBinding(part) : null);
 		}
diff --git a/src/vs/workbench/services/preferences/test/common/keybindingsEditorModel.test.ts b/src/vs/workbench/services/preferences/test/common/keybindingsEditorModel.test.ts
@@ -610,7 +610,7 @@ suite('KeybindingsEditorModel test', () => {
 			const { ctrlKey, shiftKey, altKey, metaKey } = part.modifiers || { ctrlKey: false, shiftKey: false, altKey: false, metaKey: false };
 			return new SimpleKeybinding(ctrlKey!, shiftKey!, altKey!, metaKey!, part.keyCode);
 		};
-		let parts = [];
+		let parts: SimpleKeybinding[] = [];
 		if (firstPart) {
 			parts.push(aSimpleKeybinding(firstPart));
 		}

Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,10 @@ export class ChordKeybinding {`
`517`	`517`	`return hashCodes.join(';');`
`518`	`518`	`}`
`519`	`519`
`520`		`- public equals(other: ChordKeybinding): boolean {`
	`520`	`+ public equals(other: ChordKeybinding \| null): boolean {`
	`521`	`+ if (other === null) {`
	`522`	`+ return false;`
	`523`	`+ }`
`521`	`524`	`if (this.parts.length !== other.parts.length) {`
`522`	`525`	`return false;`
`523`	`526`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export interface IControllerOptions {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`interface IKeybindingDispatcherItem {`
`52`		`- keybinding: Keybinding;`
	`52`	`+ keybinding: Keybinding \| null;`
`53`	`53`	`callback: IKeyBindingCallback;`
`54`	`54`	`}`
`55`	`55`
`@@ -63,9 +63,11 @@ export class KeybindingDispatcher {`
`63`	`63`
`64`	`64`	`public has(keybinding: KeyCode): boolean {`
`65`	`65`	`let target = createKeybinding(keybinding, platform.OS);`
`66`		`- for (const a of this._arr) {`
`67`		`- if (target.equals(a.keybinding)) {`
`68`		`- return true;`
	`66`	`+ if (target !== null) {`
	`67`	`+ for (const a of this._arr) {`
	`68`	`+ if (target.equals(a.keybinding)) {`
	`69`	`+ return true;`
	`70`	`+ }`
`69`	`71`	`}`
`70`	`72`	`}`
`71`	`73`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ export class NativeResolvedKeybinding extends ResolvedKeybinding {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`public getDispatchParts(): (string \| null)[] {`
`174`		`- let dispatchParts = [];`
	`174`	`+ let dispatchParts: (string \| null)[] = [];`
`175`	`175`	`for (let part of this._parts) {`
`176`	`176`	`dispatchParts.push(part ? this._mapper.getDispatchStrForScanCodeBinding(part) : null);`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,7 @@ suite('KeybindingsEditorModel test', () => {`
`610`	`610`	`const { ctrlKey, shiftKey, altKey, metaKey } = part.modifiers \|\| { ctrlKey: false, shiftKey: false, altKey: false, metaKey: false };`
`611`	`611`	`return new SimpleKeybinding(ctrlKey!, shiftKey!, altKey!, metaKey!, part.keyCode);`
`612`	`612`	`};`
`613`		`- let parts = [];`
	`613`	`+ let parts: SimpleKeybinding[] = [];`
`614`	`614`	`if (firstPart) {`
`615`	`615`	`parts.push(aSimpleKeybinding(firstPart));`
`616`	`616`	`}`