https-githubsup-com
diff --git a/‎src/vs/languages/json/common/parser/jsonParser.ts‎
Lines changed: 7 additions & 17 deletions b/‎src/vs/languages/json/common/parser/jsonParser.ts‎
Lines changed: 7 additions & 17 deletions
@@ -113,8 +113,6 @@ export class ASTNode {
 					location: { start: this.start, end: this.end },
 					message: nls.localize('typeArrayMismatchWarning', 'Incorrect type. Expected one of {0}', schema.type.join())
 				});
-			} else if (schema.type.length > 0) {
-				validationResult.typeMatch = true;
 			}
 		}
 		else if (schema.type) {
@@ -123,8 +121,6 @@ export class ASTNode {
 					location: { start: this.start, end: this.end },
 					message: nls.localize('typeMismatchWarning', 'Incorrect type. Expected "{0}"', schema.type)
 				});
-			} else {
-				validationResult.typeMatch = true;
 			}
 		}
 		if (Array.isArray(schema.allOf)) {
@@ -212,6 +208,8 @@ export class ASTNode {
 					location: { start: this.start, end: this.end },
 					message: nls.localize('enumWarning', 'Value is not an accepted value. Valid values: {0}', JSON.stringify(schema.enum))
 				});
+			} else {
+				validationResult.enumValueMatch = true;
 			}
 		}
 
@@ -717,14 +715,14 @@ export class ValidationResult {
 
 	public propertiesMatches: number;
 	public propertiesValueMatches: number;
-	public typeMatch: boolean;
+	public enumValueMatch: boolean;
 
 	constructor() {
 		this.errors = [];
 		this.warnings = [];
 		this.propertiesMatches = 0;
 		this.propertiesValueMatches = 0;
-		this.typeMatch = false;
+		this.enumValueMatch = false;
 	}
 
 	public hasErrors():boolean {
@@ -745,7 +743,7 @@ export class ValidationResult {
 	public mergePropertyMatch(propertyValidationResult: ValidationResult) : void {
 		this.merge(propertyValidationResult);
 		this.propertiesMatches++;
-		if (!propertyValidationResult.hasErrors()) {
+		if (propertyValidationResult.enumValueMatch || !propertyValidationResult.hasErrors() && propertyValidationResult.propertiesMatches) {
 			this.propertiesValueMatches++;
 		}
 	}
@@ -755,8 +753,8 @@ export class ValidationResult {
 		if (hasErrors !== other.hasErrors()) {
 			return hasErrors ? -1 : 1;
 		}
-		if (this.typeMatch !== other.typeMatch) {
-			return other.typeMatch ? -1 : 1;
+		if (this.enumValueMatch !== other.enumValueMatch) {
+			return other.enumValueMatch ? -1 : 1;
 		}
 		if (this.propertiesValueMatches !== other.propertiesValueMatches) {
 			return this.propertiesValueMatches - other.propertiesValueMatches;
@@ -781,18 +779,10 @@ export class JSONDocument {
 		return this.validationResult.errors;
 	}
 
-	public set errors(errors:IError[]) {
-		this.validationResult.errors = errors;
-	}
-
 	public get warnings():IError[] {
 		return this.validationResult.warnings;
 	}
 
-	public set warnings(warnings:IError[]) {
-		this.validationResult.warnings = warnings;
-	}
-
 	public getNodeFromOffset(offset:number):ASTNode {
 		return this.root && this.root.getNodeFromOffset(offset);
 	}
Original file line number	Diff line number	Diff line change
`@@ -113,8 +113,6 @@ export class ASTNode {`
`113`	`113`	`location: { start: this.start, end: this.end },`
`114`	`114`	`message: nls.localize('typeArrayMismatchWarning', 'Incorrect type. Expected one of {0}', schema.type.join())`
`115`	`115`	`});`
`116`		`- } else if (schema.type.length > 0) {`
`117`		`- validationResult.typeMatch = true;`
`118`	`116`	`}`
`119`	`117`	`}`
`120`	`118`	`else if (schema.type) {`
`@@ -123,8 +121,6 @@ export class ASTNode {`
`123`	`121`	`location: { start: this.start, end: this.end },`
`124`	`122`	`message: nls.localize('typeMismatchWarning', 'Incorrect type. Expected "{0}"', schema.type)`
`125`	`123`	`});`
`126`		`- } else {`
`127`		`- validationResult.typeMatch = true;`
`128`	`124`	`}`
`129`	`125`	`}`
`130`	`126`	`if (Array.isArray(schema.allOf)) {`
`@@ -212,6 +208,8 @@ export class ASTNode {`
`212`	`208`	`location: { start: this.start, end: this.end },`
`213`	`209`	`message: nls.localize('enumWarning', 'Value is not an accepted value. Valid values: {0}', JSON.stringify(schema.enum))`
`214`	`210`	`});`
	`211`	`+ } else {`
	`212`	`+ validationResult.enumValueMatch = true;`
`215`	`213`	`}`
`216`	`214`	`}`
`217`	`215`
`@@ -717,14 +715,14 @@ export class ValidationResult {`
`717`	`715`
`718`	`716`	`public propertiesMatches: number;`
`719`	`717`	`public propertiesValueMatches: number;`
`720`		`- public typeMatch: boolean;`
	`718`	`+ public enumValueMatch: boolean;`
`721`	`719`
`722`	`720`	`constructor() {`
`723`	`721`	`this.errors = [];`
`724`	`722`	`this.warnings = [];`
`725`	`723`	`this.propertiesMatches = 0;`
`726`	`724`	`this.propertiesValueMatches = 0;`
`727`		`- this.typeMatch = false;`
	`725`	`+ this.enumValueMatch = false;`
`728`	`726`	`}`
`729`	`727`
`730`	`728`	`public hasErrors():boolean {`
`@@ -745,7 +743,7 @@ export class ValidationResult {`
`745`	`743`	`public mergePropertyMatch(propertyValidationResult: ValidationResult) : void {`
`746`	`744`	`this.merge(propertyValidationResult);`
`747`	`745`	`this.propertiesMatches++;`
`748`		`- if (!propertyValidationResult.hasErrors()) {`
	`746`	`+ if (propertyValidationResult.enumValueMatch \|\| !propertyValidationResult.hasErrors() && propertyValidationResult.propertiesMatches) {`
`749`	`747`	`this.propertiesValueMatches++;`
`750`	`748`	`}`
`751`	`749`	`}`
`@@ -755,8 +753,8 @@ export class ValidationResult {`
`755`	`753`	`if (hasErrors !== other.hasErrors()) {`
`756`	`754`	`return hasErrors ? -1 : 1;`
`757`	`755`	`}`
`758`		`- if (this.typeMatch !== other.typeMatch) {`
`759`		`- return other.typeMatch ? -1 : 1;`
	`756`	`+ if (this.enumValueMatch !== other.enumValueMatch) {`
	`757`	`+ return other.enumValueMatch ? -1 : 1;`
`760`	`758`	`}`
`761`	`759`	`if (this.propertiesValueMatches !== other.propertiesValueMatches) {`
`762`	`760`	`return this.propertiesValueMatches - other.propertiesValueMatches;`
`@@ -781,18 +779,10 @@ export class JSONDocument {`
`781`	`779`	`return this.validationResult.errors;`
`782`	`780`	`}`
`783`	`781`
`784`		`- public set errors(errors:IError[]) {`
`785`		`- this.validationResult.errors = errors;`
`786`		`- }`
`787`		`-`
`788`	`782`	`public get warnings():IError[] {`
`789`	`783`	`return this.validationResult.warnings;`
`790`	`784`	`}`
`791`	`785`
`792`		`- public set warnings(warnings:IError[]) {`
`793`		`- this.validationResult.warnings = warnings;`
`794`		`- }`
`795`		`-`
`796`	`786`	`public getNodeFromOffset(offset:number):ASTNode {`
`797`	`787`	`return this.root && this.root.getNodeFromOffset(offset);`
`798`	`788`	`}`