Do not leave lone block

Author: Fabrice Tiercelin

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/OneTryRatherThanTwoCleanUp.java

@@ -65,7 +65,10 @@ public boolean visit(final TryStatement node) {
 		if (!tryStatements.isEmpty()) {
 			TryStatement innerTryStatement= ASTNodes.as(tryStatements.get(0), TryStatement.class);
 
-			if (innerTryStatement != null && !innerTryStatement.resources().isEmpty() && innerTryStatement.catchClauses().isEmpty()) {
+			if (innerTryStatement != null
+					&& !innerTryStatement.resources().isEmpty()
+					&& innerTryStatement.getFinally() == null
+					&& innerTryStatement.catchClauses().isEmpty()) {
 				collapseTryStatements(node, innerTryStatement);
 				return false;
 			}
@@ -81,6 +84,16 @@ private void collapseTryStatements(final TryStatement node, final TryStatement i
 		TextEditGroup group= new TextEditGroup(MultiFixMessages.OneTryRatherThanTwoCleanUp_description);
 
 		rewrite.insertLast(node, TryStatement.RESOURCES_PROPERTY, ast.copyRange((List<VariableDeclarationExpression>) innerTryStatement.resources()), group);
-		ASTNodes.replaceButKeepComment(rewrite, innerTryStatement, ASTNodes.createMoveTarget(rewrite, innerTryStatement.getBody()), group);
+		List<Statement> innerStatements= ASTNodes.asList(innerTryStatement.getBody());
+
+		if (innerStatements == null || innerStatements.isEmpty()) {
+			rewrite.removeButKeepComment(innerTryStatement, group);
+		} else {
+			ASTNodes.replaceButKeepComment(rewrite, innerTryStatement, ASTNodes.createMoveTarget(rewrite, innerStatements.get(0)), group);
+
+			for (int i= innerStatements.size() - 1; i > 1; i--) {
+				rewrite.insertAfter(ASTNodes.createMoveTarget(rewrite, innerStatements.get(i)), innerTryStatement, group);
+			}
+		}
 	}
 }

samples/src/test/java/org/autorefactor/jdt/internal/ui/fix/samples_in/OneTryRatherThanTwoSample.java

@@ -38,6 +38,18 @@ public void removeInnerTry() throws Exception {
         }
     }
 
+    public void doNotRemoveInnerTryWithFinally() throws Exception {
+        try {
+            try (final FileInputStream inputStream = new FileInputStream("out.txt")) {
+                System.out.println(inputStream.read());
+            } finally {
+                System.out.println("Do not lose me!");
+            }
+        } catch (Exception e) {
+            throw e;
+        }
+    }
+
     public void doNotRemoveInnerTryWithCatchClause() throws Exception {
         try {
             try (final FileInputStream inputStream = new FileInputStream("out.txt")) {

samples/src/test/java/org/autorefactor/jdt/internal/ui/fix/samples_out/OneTryRatherThanTwoSample.java

@@ -30,8 +30,18 @@
 public class OneTryRatherThanTwoSample {
     public void removeInnerTry() throws Exception {
         try (final FileInputStream inputStream = new FileInputStream("out.txt")) {
-            {
+            System.out.println(inputStream.read());
+        } catch (Exception e) {
+            throw e;
+        }
+    }
+
+    public void doNotRemoveInnerTryWithFinally() throws Exception {
+        try {
+            try (final FileInputStream inputStream = new FileInputStream("out.txt")) {
                 System.out.println(inputStream.read());
+            } finally {
+                System.out.println("Do not lose me!");
             }
         } catch (Exception e) {
             throw e;