JsonPatchMatcher: Short-circuit matching when possible

openrewrite · Nov 17, 2024 · f1f48c0 · f1f48c0
1 parent 0f8e755
commit f1f48c0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/JsonPathMatcher.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/JsonPathMatcher.java
@@ -20,6 +20,7 @@
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.RuleNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 import org.jspecify.annotations.Nullable;
 import org.openrewrite.Cursor;
@@ -137,6 +138,11 @@ protected Object aggregateResult(Object aggregate, Object nextResult) {
             return (scope = nextResult);
         }
 
+        @Override
+        protected boolean shouldVisitNextChild(RuleNode node, Object currentResult) {
+            return scope != null;
+        }
+
         @Override
         public Object visitJsonPath(JsonPathParser.JsonPathContext ctx) {
             if (ctx.ROOT() != null || "[".equals(ctx.start.getText())) {

diff --git a/rewrite-json/src/main/java/org/openrewrite/json/JsonPathMatcher.java b/rewrite-json/src/main/java/org/openrewrite/json/JsonPathMatcher.java
@@ -20,6 +20,7 @@
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.RuleNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 import org.jspecify.annotations.Nullable;
 import org.openrewrite.Cursor;
@@ -137,6 +138,11 @@ protected Object aggregateResult(Object aggregate, Object nextResult) {
             return (scope = nextResult);
         }
 
+        @Override
+        protected boolean shouldVisitNextChild(RuleNode node, Object currentResult) {
+            return scope != null;
+        }
+
         @Override
         public Object visitJsonPath(JsonPathParser.JsonPathContext ctx) {
             if (ctx.ROOT() != null || "[".equals(ctx.start.getText())) {

diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/JsonPathMatcher.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/JsonPathMatcher.java
@@ -20,6 +20,7 @@
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.RuleNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 import org.jspecify.annotations.Nullable;
 import org.openrewrite.Cursor;
@@ -161,6 +162,11 @@ protected Object aggregateResult(Object aggregate, Object nextResult) {
             return (scope = nextResult);
         }
 
+        @Override
+        protected boolean shouldVisitNextChild(RuleNode node, Object currentResult) {
+            return scope != null;
+        }
+
         @Override
         public Object visitJsonPath(JsonPathParser.JsonPathContext ctx) {
             MATCH: