Java ConvertToARM fix: Fix case where existing variable (without declaration) is guarded and other variables are used outside the new block

Example:

============== Source ==============

import java.io.ByteArrayOutputStream;
import java.io.InputStream;

public class Test {

    public static byte[] test(InputStream input) throws Exception {
        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
        int len;

        byte[] buffer = new byte[1024];

        while ((len = input.read(buffer)) != -1) {
            outStream.write(buffer, 0, len);
        }
        input.close();

        return outStream.toByteArray();
    }
}

============== Result ==============

import java.io.ByteArrayOutputStream;
import java.io.InputStream;

public class Test {

    public static byte[] test(InputStream input) throws Exception {
        try (input) {
            outStream = new ByteArrayOutputStream();
            int len;
            byte[] buffer = new byte[1024];
            while ((len = input.read(buffer)) != -1) {
                outStream.write(buffer, 0, len);
            }
        }

        return outStream.toByteArray();
    }
}

====================================

Problem is here, that the result variable is used outside the new try
block, but the declaration is not written.


Closes: #9046

Author: matthiasblaesing

java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToARM.java

@@ -612,12 +612,16 @@ private static BlockTree rewriteOwnerBlock(
             final List<StatementTree> statements = new ArrayList<StatementTree>(originalStatements.size());
             int state = var != null ? 0 : 1;  //0 - ordinary,1 - replace by try, 2 - remove 
             final Set<Tree> toRemove = new HashSet<Tree>(oldStms);
+            boolean preVarDeclsWritten = false;
             for (StatementTree statement : originalStatements) {
                 if (removeStms.contains(statement)) {
                     continue;
                 }
                 if (var == statement) {
-                    statements.addAll(preVarDecls);
+                    if (!preVarDeclsWritten) {
+                        preVarDeclsWritten = true;
+                        statements.addAll(preVarDecls);
+                    }
                     if (var.getKind() == Kind.TRY) {
                         gen.copyComments(statement, newTry, true);
                         gen.copyComments(statement, newTry, false);
@@ -658,6 +662,10 @@ private static BlockTree rewriteOwnerBlock(
                             gen.copyComments(tt.getFinallyBlock(), nt, false);
                         }
                     }
+                    if(! preVarDeclsWritten) {
+                        preVarDeclsWritten = true;
+                        statements.addAll(preVarDecls);
+                    }
                     statement = newTry;
                 } else if (state == 2) {
                     if (!toRemove.contains(statement)) {
@@ -667,6 +675,7 @@ private static BlockTree rewriteOwnerBlock(
                 }
                 statements.add(statement);
             }
+
             return tm.Block(statements, false);
         }
 

java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertToARMTest.java

@@ -1554,4 +1554,54 @@ public void testPreserveComments228141() throws Exception {
             }
         }
     }
+
+    // Case: 
+    public void testGH9046() throws Exception {
+        HintTest
+                .create()
+                .input("package test;\n"
+                        + "import java.io.ByteArrayOutputStream;\n"
+                        + "import java.io.InputStream;\n"
+                        + "\n"
+                        + "public class Test {\n"
+                        + "\n"
+                        + "    public static byte[] test(InputStream input) throws Exception {\n"
+                        + "        ByteArrayOutputStream outStream = new ByteArrayOutputStream();\n"
+                        + "        int len;\n"
+                        + "\n"
+                        + "        byte[] buffer = new byte[1024];\n"
+                        + "\n"
+                        + "        while ((len = input.read(buffer)) != -1) {\n"
+                        + "            outStream.write(buffer, 0, len);\n"
+                        + "        }\n"
+                        + "        input.close();\n"
+                        + "\n"
+                        + "        return outStream.toByteArray();\n"
+                        + "    }\n"
+                        + "}\n")
+                .sourceLevel("17")
+                .run(ConvertToARM.class)
+                .findWarning("12:22-12:27:verifier:TXT_ConvertToARM")
+                .applyFix("TXT_ConvertToARM")
+                .assertOutput("package test;\n"
+                        + "import java.io.ByteArrayOutputStream;\n"
+                        + "import java.io.InputStream;\n"
+                        + "\n"
+                        + "public class Test {\n"
+                        + "\n"
+                        + "    public static byte[] test(InputStream input) throws Exception {\n"
+                        + "        ByteArrayOutputStream outStream;\n"
+                        + "        try (input) {\n"
+                        + "            outStream = new ByteArrayOutputStream();\n"
+                        + "            int len;\n"
+                        + "            byte[] buffer = new byte[1024];\n"
+                        + "            while ((len = input.read(buffer)) != -1) {\n"
+                        + "                outStream.write(buffer, 0, len);\n"
+                        + "            }\n"
+                        + "        }\n"
+                        + "\n"
+                        + "        return outStream.toByteArray();\n"
+                        + "    }\n"
+                        + "}\n");
+    }
 }