Fixes microsoft#106524: Normalize AND expressions with a single operand

alexdima · alexdima · commit 2441447b026a · 2020-09-16T12:10:46.000+02:00
diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts
@@ -884,6 +884,10 @@ export class ContextKeyAndExpr implements IContextKeyExpression {
 			}
 		}
 
+		if (expr.length === 1) {
+			return expr[0];
+		}
+
 		return new ContextKeyAndExpr(expr);
 	}
 
diff --git a/src/vs/platform/contextkey/test/common/contextkey.test.ts b/src/vs/platform/contextkey/test/common/contextkey.test.ts
@@ -165,4 +165,25 @@ suite('ContextKeyExpr', () => {
 		assert.equal(ainb.evaluate(createContext({ 'a': 'x', 'b': { 'x': true } })), true);
 		assert.equal(ainb.evaluate(createContext({ 'a': 'prototype', 'b': {} })), false);
 	});
+
+	test('issue #106524: distributing AND should normalize', () => {
+		const actual = ContextKeyExpr.and(
+			ContextKeyExpr.or(
+				ContextKeyExpr.has('a'),
+				ContextKeyExpr.has('b')
+			),
+			ContextKeyExpr.has('c')
+		);
+		const expected = ContextKeyExpr.or(
+			ContextKeyExpr.and(
+				ContextKeyExpr.has('a'),
+				ContextKeyExpr.has('c')
+			),
+			ContextKeyExpr.and(
+				ContextKeyExpr.has('b'),
+				ContextKeyExpr.has('c')
+			)
+		);
+		assert.equal(actual!.equals(expected!), true);
+	});
 });

Original file line number	Diff line number	Diff line change
`@@ -884,6 +884,10 @@ export class ContextKeyAndExpr implements IContextKeyExpression {`
`884`	`884`	`}`
`885`	`885`	`}`
`886`	`886`
	`887`	`+ if (expr.length === 1) {`
	`888`	`+ return expr[0];`
	`889`	`+ }`
	`890`	`+`
`887`	`891`	`return new ContextKeyAndExpr(expr);`
`888`	`892`	`}`
`889`	`893`