Merge every closed resource of a try in one pass in UseTryWithResources (#1105)

A try whose finally closes both an adjacent and a non-adjacent declaration
had only the adjacent one merged per cycle, so the recipe needed a second
cycle to add the other. Apply the non-adjacent merge after the adjacent one,
and repeat it for each remaining close in the finally.

Author: knutwannheden

src/main/java/org/openrewrite/staticanalysis/UseTryWithResources.java

@@ -82,26 +82,30 @@ public J.Block visitBlock(J.Block block, ExecutionContext ctx) {
                                     J.VariableDeclarations prevDecl = (J.VariableDeclarations) stmts.get(i - 1);
                                     if (canTransform(prevDecl, tryStmt)) {
                                         boolean usedAfter = isUsedAfter(prevDecl.getVariables().get(0).getSimpleName(), stmts, i);
-                                        if (usedAfter) {
-                                            return transformJava9(prevDecl, tryStmt);
-                                        }
-                                        return transform(prevDecl, tryStmt, unnamedAvailable);
+                                        tryStmt = usedAfter ?
+                                                transformJava9(prevDecl, tryStmt) :
+                                                transform(prevDecl, tryStmt, unnamedAvailable);
                                     }
                                 }
 
-                                // Case 2: Non-consecutive — varDecl separated by intervening statements
-                                if (tryStmt.getFinally() != null) {
+                                // Case 2: Non-consecutive — varDecl separated by intervening statements.
+                                // Each merge strips a close from the finally, so the loop ends.
+                                while (tryStmt.getFinally() != null) {
                                     String closedVar = extractClosedVarName(tryStmt.getFinally());
-                                    if (closedVar != null) {
-                                        int declIdx = findMatchingVarDecl(stmts, i, closedVar);
-                                        if (declIdx >= 0 && declIdx < i - 1) {
-                                            J.VariableDeclarations varDecl = (J.VariableDeclarations) stmts.get(declIdx);
-                                            if (canTransform(varDecl, tryStmt) && !isReassignedBetween(closedVar, stmts, declIdx, i)) {
-                                                return transformJava9(varDecl, tryStmt);
-                                            }
-                                        }
+                                    if (closedVar == null) {
+                                        break;
                                     }
+                                    int declIdx = findMatchingVarDecl(stmts, i, closedVar);
+                                    if (declIdx < 0 || declIdx >= i - 1) {
+                                        break;
+                                    }
+                                    J.VariableDeclarations varDecl = (J.VariableDeclarations) stmts.get(declIdx);
+                                    if (!canTransform(varDecl, tryStmt) || isReassignedBetween(closedVar, stmts, declIdx, i)) {
+                                        break;
+                                    }
+                                    tryStmt = transformJava9(varDecl, tryStmt);
                                 }
+                                return tryStmt;
                             }
                             // Remove varDecl that was merged into the following try-with-resources
                             if (stmt instanceof J.VariableDeclarations && i + 1 < stmts.size() &&

src/test/java/org/openrewrite/staticanalysis/UseTryWithResourcesTest.java

@@ -612,7 +612,6 @@ void method(String path) throws IOException {
     @Test
     void multipleClosesInFinallyPicksMatchingVariable() {
         rewriteRun(
-          spec -> spec.expectedCyclesThatMakeChanges(2),
           //language=java
           java(
             """