Merge from vscode 6268feb42ba4f2e2fa15484e88c9af60d254998c (#6530)

This commit is contained in:
Anthony Dresser
2019-07-29 21:03:02 -07:00
committed by GitHub
parent 2c8a22bb0d
commit 6db84eefa3
104 changed files with 1797 additions and 3740 deletions

View File

@@ -21,10 +21,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;
}
@@ -217,7 +217,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);
}
@@ -451,7 +451,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);
}