Fix else-if test structure and improve formatting stability.

- Update else-if test to use testSampleWithOptions pattern
- Rename test files to follow expected naming convention
- Fix empty block formatting in next-line brace style
- Remove extra hardline in printBlock for empty blocks
- Improve instance initializer formatting consistency

Author: motlin

packages/prettier-plugin-java/src/printers/classes.ts

@@ -302,7 +302,9 @@ export default {
 
   exceptionType: printSingle,
   methodBody: printSingle,
-  instanceInitializer: printSingle,
+  instanceInitializer(path, print) {
+    return call(path, print, "block");
+  },
 
   staticInitializer(path, print, options) {
     return formatWithBraces("static", call(path, print, "block"), options);

packages/prettier-plugin-java/src/printers/helpers.ts

@@ -286,7 +286,7 @@ export function printBlock(
             hardline,
             "}"
           ]
-        : [hardline, "{", hardline, "}"];
+        : [hardline, "{", "}"];
     }
     return danglingComments.length
       ? ["{", indent([hardline, ...danglingComments]), hardline, "}"]

packages/prettier-plugin-java/test/unit-test/braces-next-line/_output.java

@@ -282,114 +282,93 @@ public void synchronizedMethod()
 class HelperMethods
 {
   void riskyOperation() throws Exception
-  {
-  }
+  {}
 
   void handleError(Exception e)
-  {
-  }
+  {}
 
   void handleIOError(IOException e)
-  {
-  }
+  {}
 
   void handleSQLError(SQLException e)
-  {
-  }
+  {}
 
   void cleanup()
-  {
-  }
+  {}
 
   void readFile(FileInputStream fis)
-  {
-  }
+  {}
 
   void processString(String s)
-  {
-  }
+  {}
 }
 
 // Test empty blocks for all constructs
 class EmptyBlocksTest
 {
   // Empty class declaration
   static class EmptyClass
-  {
-  }
+  {}
 
   // Empty interface declaration
   interface EmptyInterface
-  {
-  }
+  {}
 
   // Empty enum
   enum EmptyEnum
-  {
-  }
+  {}
 
   // Empty method
   void emptyMethod()
-  {
-  }
+  {}
 
   // Empty constructor
   EmptyBlocksTest()
-  {
-  }
+  {}
 
   // Empty static initializer
   static
-  {
-  }
+  {}
 
   // Empty instance initializer
 
-  {
-  }
+  {}
 
   // Empty blocks in statements
   void testEmptyStatementBlocks()
   {
     // Empty if
     if (true)
-    {
-    }
+    {}
 
     // Empty else
     if (false)
     {
       System.out.println("not empty");
     }
     else
-    {
-    }
+    {}
 
     // Empty while
     while (false)
-    {
-    }
+    {}
 
     // Empty do-while
     do
-    {
-    }
+    {}
     while (false);
 
     // Empty for
     for (int i = 0; i < 0; i++)
-    {
-    }
+    {}
 
     // Empty enhanced for
     for (String s : new String[0])
-    {
-    }
+    {}
 
     // Empty try
     try
-    {
-    }
+    {}
     catch (Exception e)
     {
       e.printStackTrace();
@@ -401,50 +380,41 @@ void testEmptyStatementBlocks()
       throw new Exception();
     }
     catch (Exception e)
-    {
-    }
+    {}
 
     // Empty finally
     try
     {
       System.out.println("try");
     }
     finally
-    {
-    }
+    {}
 
     // Empty try-catch-finally
     try
-    {
-    }
+    {}
     catch (Exception e)
-    {
-    }
+    {}
     finally
-    {
-    }
+    {}
 
     // Empty synchronized
     synchronized (this)
-    {
-    }
+    {}
 
     // Empty switch
     switch (1)
-    {
-    }
+    {}
 
     // Empty anonymous class
     Runnable r = new Runnable()
     {
       public void run()
-      {
-      }
+      {}
     };
 
     // Empty lambda block
     Runnable lambda = () ->
-    {
-    };
+    {};
   }
 }

…est/unit-test/else-if/else-if-input.java …-java/test/unit-test/else-if/_input.javapackages/prettier-plugin-java/test/unit-test/else-if/else-if-input.java renamed to packages/prettier-plugin-java/test/unit-test/else-if/_input.java packages/prettier-plugin-java/test/unit-test/else-if/else-if-input.java renamed to packages/prettier-plugin-java/test/unit-test/else-if/_input.java

@@ -1,18 +1,11 @@
-import { testSample } from "../../test-utils.js";
+import path from "path";
+import url from "url";
+import { testSampleWithOptions } from "../../test-utils.js";
 
-describe("else-if formatting", () => {
-  // With default braceStyle (same-line)
-  testSample(__dirname, "else-if-input", {
-    prettierOptions: {
-      braceStyle: "same-line",
-    },
-  });
+const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 
-  // With next-line braceStyle
-  testSample(__dirname, "else-if-input", {
-    prettierOptions: {
-      braceStyle: "next-line",
-    },
-    expectedSampleSuffix: "-next-line",
+describe("else-if formatting", () => {
+  testSampleWithOptions({
+    testFolder: __dirname,
   });
 });