Simplify requirements for IContextKeyExprMapper

alexdima · alexdima · commit 76ab4ecfcba0 · 2019-07-29T14:22:18.000+02:00
diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts
@@ -19,10 +19,10 @@ export const enum ContextKeyExprType {
 }
 
 export interface IContextKeyExprMapper {
-	mapDefined(key: string): ContextKeyDefinedExpr;
-	mapNot(key: string): ContextKeyNotExpr;
-	mapEquals(key: string, value: any): ContextKeyEqualsExpr;
-	mapNotEquals(key: string, value: any): ContextKeyNotEqualsExpr;
+	mapDefined(key: string): ContextKeyExpr;
+	mapNot(key: string): ContextKeyExpr;
+	mapEquals(key: string, value: any): ContextKeyExpr;
+	mapNotEquals(key: string, value: any): ContextKeyExpr;
 	mapRegex(key: string, regexp: RegExp | null): ContextKeyRegexExpr;
 }
 
@@ -190,7 +190,7 @@ function cmp(a: ContextKeyExpr, b: ContextKeyExpr): number {
 }
 
 export class ContextKeyDefinedExpr implements ContextKeyExpr {
-	public static create(key: string): ContextKeyExpr {
+	public static create(key: string): ContextKeyDefinedExpr {
 		return new ContextKeyDefinedExpr(key);
 	}
 
@@ -424,7 +424,7 @@ export class ContextKeyNotExpr implements ContextKeyExpr {
 
 export class ContextKeyRegexExpr implements ContextKeyExpr {
 
-	public static create(key: string, regexp: RegExp | null): ContextKeyExpr {
+	public static create(key: string, regexp: RegExp | null): ContextKeyRegexExpr {
 		return new ContextKeyRegexExpr(key, regexp);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ export const enum ContextKeyExprType {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`export interface IContextKeyExprMapper {`
`22`		`- mapDefined(key: string): ContextKeyDefinedExpr;`
`23`		`- mapNot(key: string): ContextKeyNotExpr;`
`24`		`- mapEquals(key: string, value: any): ContextKeyEqualsExpr;`
`25`		`- mapNotEquals(key: string, value: any): ContextKeyNotEqualsExpr;`
	`22`	`+ mapDefined(key: string): ContextKeyExpr;`
	`23`	`+ mapNot(key: string): ContextKeyExpr;`
	`24`	`+ mapEquals(key: string, value: any): ContextKeyExpr;`
	`25`	`+ mapNotEquals(key: string, value: any): ContextKeyExpr;`
`26`	`26`	`mapRegex(key: string, regexp: RegExp \| null): ContextKeyRegexExpr;`
`27`	`27`	`}`
`28`	`28`
`@@ -190,7 +190,7 @@ function cmp(a: ContextKeyExpr, b: ContextKeyExpr): number {`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`export class ContextKeyDefinedExpr implements ContextKeyExpr {`
`193`		`- public static create(key: string): ContextKeyExpr {`
	`193`	`+ public static create(key: string): ContextKeyDefinedExpr {`
`194`	`194`	`return new ContextKeyDefinedExpr(key);`
`195`	`195`	`}`
`196`	`196`
`@@ -424,7 +424,7 @@ export class ContextKeyNotExpr implements ContextKeyExpr {`
`424`	`424`
`425`	`425`	`export class ContextKeyRegexExpr implements ContextKeyExpr {`
`426`	`426`
`427`		`- public static create(key: string, regexp: RegExp \| null): ContextKeyExpr {`
	`427`	`+ public static create(key: string, regexp: RegExp \| null): ContextKeyRegexExpr {`
`428`	`428`	`return new ContextKeyRegexExpr(key, regexp);`
`429`	`429`	`}`
`430`	`430`