Any source applicable tests should be ANDed together not ORed / fixes #…

…2543
openrewrite · Dec 16, 2022 · ca25377 · ca25377
1 parent dbf7dba
commit ca25377
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/rewrite-core/src/main/java/org/openrewrite/RecipeScheduler.java b/rewrite-core/src/main/java/org/openrewrite/RecipeScheduler.java
@@ -159,13 +159,17 @@ default <S extends SourceFile> List<S> scheduleVisit(RecipeRunStats runStats,
             ((WatchableExecutionContext) ctx).resetHasNewMessages();
         }
         try {
-            for (S s : before) {
-                for (Recipe r : recipeStack) {
-                    for (TreeVisitor<?, ExecutionContext> applicableTest : r.getApplicableTests()) {
-                        if (applicableTest.visit(s, ctx) == s) {
-                            return before;
+            for (Recipe r : recipeStack) {
+                nextTest:
+                for (TreeVisitor<?, ExecutionContext> applicableTest : r.getApplicableTests()) {
+                    for (S s : before) {
+                        if (applicableTest.visit(s, ctx) != s) {
+                            continue nextTest;
                         }
                     }
+                    if (!before.isEmpty()) {
+                        return before;
+                    }
                 }
             }
         } catch (Throwable t) {