Extend IContextKeyChangeEvent as a better solution for microsoft#152775 (microsoft#153402)

Author: roblourens

src/vs/platform/contextkey/browser/contextKeyService.ts

@@ -225,6 +225,9 @@ class SimpleContextKeyChangeEvent implements IContextKeyChangeEvent {
 	affectsSome(keys: IReadableSet<string>): boolean {
 		return keys.has(this.key);
 	}
+	allKeysContainedIn(keys: IReadableSet<string>): boolean {
+		return this.affectsSome(keys);
+	}
 }
 
 class ArrayContextKeyChangeEvent implements IContextKeyChangeEvent {
@@ -237,6 +240,9 @@ class ArrayContextKeyChangeEvent implements IContextKeyChangeEvent {
 		}
 		return false;
 	}
+	allKeysContainedIn(keys: IReadableSet<string>): boolean {
+		return this.keys.every(key => keys.has(key));
+	}
 }
 
 class CompositeContextKeyChangeEvent implements IContextKeyChangeEvent {
@@ -249,12 +255,13 @@ class CompositeContextKeyChangeEvent implements IContextKeyChangeEvent {
 		}
 		return false;
 	}
+	allKeysContainedIn(keys: IReadableSet<string>): boolean {
+		return this.events.every(evt => evt.allKeysContainedIn(keys));
+	}
 }
 
 function allEventKeysInContext(event: IContextKeyChangeEvent, context: Record<string, any>): boolean {
-	return (event instanceof ArrayContextKeyChangeEvent && event.keys.every(key => key in context)) ||
-		(event instanceof SimpleContextKeyChangeEvent && event.key in context) ||
-		(event instanceof CompositeContextKeyChangeEvent && event.events.every(e => allEventKeysInContext(e, context)));
+	return event.allKeysContainedIn(new Set(Object.keys(context)));
 }
 
 export abstract class AbstractContextKeyService implements IContextKeyService {

src/vs/platform/contextkey/common/contextkey.ts

@@ -1597,6 +1597,7 @@ export interface IReadableSet<T> {
 
 export interface IContextKeyChangeEvent {
 	affectsSome(keys: IReadableSet<string>): boolean;
+	allKeysContainedIn(keys: IReadableSet<string>): boolean;
 }
 
 export interface IContextKeyService {