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: correct tree traverse passing (parent, leaf-child) pair

Browse Source 
WEB-29164 JSON schema: correctly resolve between oneOf/anyOf variants
This commit is contained in:
Irina.Chernushina
2017-10-12 14:09:26 +02:00
parent 4f771a9e92
commit e53e2dafce
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/impl/MatchResult.java
+16 -16
View File
@@ -15,9 +15,9 @@
*/
package com.jetbrains.jsonSchema.impl;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.Pair;
import com.intellij.util.Consumer;
import com.intellij.util.PairProcessor;
import com.intellij.util.containers.JBTreeTraverser;
import org.jetbrains.annotations.NotNull;
import java.util.*;
@@ -55,20 +55,20 @@ public class MatchResult {
public static void iterateTree(@NotNull JsonSchemaTreeNode root,
@NotNull final PairProcessor<JsonSchemaTreeNode, JsonSchemaTreeNode> parentChildConsumer) {
final Ref<JsonSchemaTreeNode> parentRef = new Ref<>(root);
JBTreeTraverser.<JsonSchemaTreeNode>from(node -> node.getChildren())
.withRoot(root)
.preOrderDfsTraversal()
.processEach(node -> {
if (!node.getChildren().isEmpty()) {
parentRef.set(node);
return true;
final ArrayDeque<Pair<JsonSchemaTreeNode, JsonSchemaTreeNode>> queue = new ArrayDeque<>();
final Consumer<JsonSchemaTreeNode> queueChildren = node -> node.getChildren().forEach(child -> queue.add(Pair.create(node, child)));
queueChildren.consume(root);
while (!queue.isEmpty()) {
final Pair<JsonSchemaTreeNode, JsonSchemaTreeNode> pair = queue.removeFirst();
final JsonSchemaTreeNode node = pair.getSecond();
if (node.getChildren().isEmpty()) {
if (!node.isNothing() && SchemaResolveState.normal.equals(node.getResolveState()) &&
!parentChildConsumer.process(pair.getFirst(), node)) {
break;
}
if (node.getChildren().isEmpty() && !node.isNothing() && SchemaResolveState.normal.equals(node.getResolveState())) {
assert !parentRef.isNull();
return parentChildConsumer.process(parentRef.get(), node);
}
return true;
});
} else {
queueChildren.consume(node);
}
}
}
}