MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

json schema: avoid textual error match, looks like an ugly hack

Browse Source
This commit is contained in:
Anton Lobov
2018-08-01 13:24:07 +02:00
parent 0b8d9b3e50
commit d4383fed22
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaAnnotatorChecker.java
+6 -4
View File
@@ -89,18 +89,20 @@ class JsonSchemaAnnotatorChecker {
private static JsonSchemaAnnotatorChecker mergeErrors(@NotNull List<JsonSchemaAnnotatorChecker> list,
@NotNull List<JsonSchemaObject> selectedSchemas,
@NotNull JsonComplianceCheckerOptions options) {
final Set<String> skipErrors = selectedSchemas.stream().filter(Predicates.notNull())
final Set<String> propNames = selectedSchemas.stream().filter(Predicates.notNull())
.map(schema -> schema.getProperties().keySet())
.flatMap(Set::stream).map(name -> JsonBundle.message("json.schema.annotation.not.allowed.property", name))
.flatMap(Set::stream)
.collect(Collectors.toSet());
final JsonSchemaAnnotatorChecker checker = new JsonSchemaAnnotatorChecker(options);
for (JsonSchemaAnnotatorChecker ch: list) {
for (Map.Entry<PsiElement, JsonValidationError> element: ch.myErrors.entrySet()) {
if (skipErrors.contains(element.getValue().getMessage())) {
JsonValidationError error = element.getValue();
if (error.getFixableIssueKind() == JsonValidationError.FixableIssueKind.ProhibitedProperty
&& propNames.contains(((JsonValidationError.ProhibitedPropertyIssueData)error.getIssueData()).propertyName)) {
continue;
}
checker.myErrors.put(element.getKey(), element.getValue());
checker.myErrors.put(element.getKey(), error);
}
}
return checker;