Remove extra null checking

mjbvz · mjbvz · commit d881556cf53e · 2020-02-05T18:12:26.000-08:00
Strict null checks should catch this now
diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts
@@ -597,29 +597,27 @@ export class ContextKeyAndExpr implements ContextKeyExpr {
 	private static _normalizeArr(arr: Array<ContextKeyExpr | null | undefined>): ContextKeyExpr[] {
 		let expr: ContextKeyExpr[] = [];
 
-		if (arr) {
-			for (let i = 0, len = arr.length; i < len; i++) {
-				let e: ContextKeyExpr | null | undefined = arr[i];
-				if (!e) {
-					continue;
-				}
-
-				if (e instanceof ContextKeyAndExpr) {
-					expr = expr.concat(e.expr);
-					continue;
-				}
+		for (let i = 0, len = arr.length; i < len; i++) {
+			let e: ContextKeyExpr | null | undefined = arr[i];
+			if (!e) {
+				continue;
+			}
 
-				if (e instanceof ContextKeyOrExpr) {
-					// Not allowed, because we don't have parens!
-					throw new Error(`It is not allowed to have an or expression here due to lack of parens! For example "a && (b||c)" is not supported, use "(a&&b) || (a&&c)" instead.`);
-				}
+			if (e instanceof ContextKeyAndExpr) {
+				expr = expr.concat(e.expr);
+				continue;
+			}
 
-				expr.push(e);
+			if (e instanceof ContextKeyOrExpr) {
+				// Not allowed, because we don't have parens!
+				throw new Error(`It is not allowed to have an or expression here due to lack of parens! For example "a && (b||c)" is not supported, use "(a&&b) || (a&&c)" instead.`);
 			}
 
-			expr.sort(cmp);
+			expr.push(e);
 		}
 
+		expr.sort(cmp);
+
 		return expr;
 	}
 
