MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

[json] IJPL-157032 Do not forget to inherit schema objects in an array step just like in a property step

Browse Source 
GitOrigin-RevId: 73ad3d09da2ffbeec94a6b1ce0bd77a242b4bdee
This commit is contained in:
Nikita Katkov
2024-06-21 01:43:56 +02:00
committed by intellij-monorepo-bot
parent 962b3cc353
commit 5723d5b61e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaVariantsTreeBuilder.java
View File

@@ -189,25 +189,25 @@ public final class JsonSchemaVariantsTreeBuilder {
private static @NotNull Pair<ThreeState, JsonSchemaObject> arrayOrNumericPropertyElementStep(int idx, @NotNull JsonSchemaObject parent) {
if (parent.getItemsSchema() != null) {
return Pair.create(ThreeState.UNSURE, parent.getItemsSchema());
return Pair.create(ThreeState.UNSURE, inheritBaseSchemaIfNeeded(parent, parent.getItemsSchema()));
}
if (parent.getItemsSchemaList() != null) {
final var list = parent.getItemsSchemaList();
if (idx >= 0 && idx < list.size()) {
return Pair.create(ThreeState.UNSURE, list.get(idx));
return Pair.create(ThreeState.UNSURE, inheritBaseSchemaIfNeeded(parent, list.get(idx)));
}
}
final String keyAsString = String.valueOf(idx);
var propWithNameOrNull = parent.getPropertyByName(keyAsString);
if (propWithNameOrNull != null) {
return Pair.create(ThreeState.UNSURE, propWithNameOrNull);
return Pair.create(ThreeState.UNSURE, inheritBaseSchemaIfNeeded(parent, propWithNameOrNull));
}
final JsonSchemaObject matchingPatternPropertySchema = parent.getMatchingPatternPropertySchema(keyAsString);
if (matchingPatternPropertySchema != null) {
return Pair.create(ThreeState.UNSURE, matchingPatternPropertySchema);
return Pair.create(ThreeState.UNSURE, inheritBaseSchemaIfNeeded(parent, matchingPatternPropertySchema));
}
if (parent.getAdditionalItemsSchema() != null) {
return Pair.create(ThreeState.UNSURE, parent.getAdditionalItemsSchema());
return Pair.create(ThreeState.UNSURE, inheritBaseSchemaIfNeeded(parent, parent.getAdditionalItemsSchema()));
}
if (Boolean.FALSE.equals(parent.getAdditionalItemsAllowed())) {
return Pair.create(ThreeState.NO, null);
@@ -216,10 +216,10 @@ public final class JsonSchemaVariantsTreeBuilder {
JsonSchemaObject unevaluatedItemsSchema = parent.getUnevaluatedItemsSchema();
if (unevaluatedItemsSchema != null) {
if (Boolean.TRUE.equals(unevaluatedItemsSchema.getConstantSchema())) {
return Pair.create(ThreeState.YES, unevaluatedItemsSchema);
return Pair.create(ThreeState.YES, inheritBaseSchemaIfNeeded(parent, unevaluatedItemsSchema));
}
else {
return Pair.create(ThreeState.UNSURE, unevaluatedItemsSchema);
return Pair.create(ThreeState.UNSURE, inheritBaseSchemaIfNeeded(parent, unevaluatedItemsSchema));
}
}