Attempting to fix the converted output.

Author: lahodaj

java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java

@@ -355,7 +355,8 @@ public static Collection<Diff> diff(Context context,
         }
 
         td.copyTo(lineStart, start, td.printer);
-        td.diffTree(oldTreePath, newTree, new int[] {start, bounds[1]});
+        int diffEndPos = td.diffTree(oldTreePath, newTree, new int[] {start, bounds[1]});
+        end = Math.max(end, diffEndPos);
         String resultSrc = td.printer.toString().substring(start - lineStart);
         if (!td.printer.reindentRegions.isEmpty()) {
             // must add region boundaries to tag2span, since the text may be reformatted.

java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/VarCompoundDeclarationTest.java

@@ -138,7 +138,7 @@ public void testVarCompoundDeclaration3() throws Exception {
                 + "        switch(i){\n"
                 + "            case 1:\n"
                 + "            var v = 1;\n"
-                + "            var v1 = 10;\n\n"
+                + "            var v1 = 10;\n"
                 + "        }\n"
                 + "    }\n"
                 + "}\n";
@@ -172,7 +172,7 @@ public void testVarCompoundDeclaration4() throws Exception {
                 + "            case 1:\n"
                 + "             final var v = 1;\n"
                 + "             final var v1 = 10;\n"
-                + "             break;\n\n"
+                + "             break;\n"
                 + "            }\n"
                 + "    }\n"
                 + "}\n";