Add braceStyle option with same-line (default) and next-line choices.

Author: motlin

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
       - id: end-of-file-fixer
         exclude: "package-lock\\.json|^\\.idea/"
       - id: trailing-whitespace
-        exclude: "package-lock\\.json|^\\.idea/"
+        exclude: "package-lock\\.json|^\\.idea/|prettier-ignore.*_output\\.java$"
       - id: check-added-large-files
         args: ["--maxkb=1000"]
       - id: check-case-conflict

packages/prettier-plugin-java/test/unit-test/.prettierrc.json

@@ -0,0 +1,3 @@
+{
+  "braceStyle": "next-line"
+}

packages/prettier-plugin-java/test/unit-test/binary_expressions/binary_expressions-spec.ts

@@ -6,11 +6,11 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 
 describe("prettier-java", () => {
   testSampleWithOptions({
-    testFolder: path.resolve(__dirname, "operator-position-start")
+    testFolder: path.resolve(__dirname, "operator-position-start"),
   });
 
   testSampleWithOptions({
-    testFolder: path.resolve(__dirname, "operator-position-end")
+    testFolder: path.resolve(__dirname, "operator-position-end"),
   });
   testSample(path.resolve(__dirname, "operator-position-end"));
 });

packages/prettier-plugin-java/test/unit-test/comments/comments-spec.ts

@@ -11,16 +11,16 @@ describe("prettier-java", () => {
   testSample(path.resolve(__dirname, "./interface"));
   testSample(path.resolve(__dirname, "./package"));
   testSample(
-    path.resolve(__dirname, "./comments-blocks-and-statements/complex")
+    path.resolve(__dirname, "./comments-blocks-and-statements/complex"),
   );
   testSample(
-    path.resolve(__dirname, "./comments-blocks-and-statements/if-statement")
+    path.resolve(__dirname, "./comments-blocks-and-statements/if-statement"),
   );
   testSample(
     path.resolve(
       __dirname,
-      "./comments-blocks-and-statements/labeled-statement"
-    )
+      "./comments-blocks-and-statements/labeled-statement",
+    ),
   );
   testSample(path.resolve(__dirname, "./comments-only"));
   testSample(path.resolve(__dirname, "./bug-fixes"));

packages/prettier-plugin-java/test/unit-test/else-if/else-if-spec.ts

@@ -6,6 +6,6 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 
 describe("else-if formatting", () => {
   testSampleWithOptions({
-    testFolder: __dirname
+    testFolder: __dirname,
   });
 });

packages/prettier-plugin-java/test/unit-test/require-pragma/require-pragma-spec.ts

@@ -8,10 +8,10 @@ describe("prettier-java: require-pragma option", () => {
   [
     path.resolve(__dirname, "./format-pragma"),
     path.resolve(__dirname, "./prettier-pragma"),
-    path.resolve(__dirname, "./invalid-pragma")
-  ].forEach(testFolder => {
+    path.resolve(__dirname, "./invalid-pragma"),
+  ].forEach((testFolder) => {
     testSampleWithOptions({
-      testFolder
+      testFolder,
     });
   });
 });

packages/prettier-plugin-java/test/unit-test/snippets/arrays/array-initializer.spec.ts

@@ -5,15 +5,15 @@ describe("Arrays Initializer", () => {
     expectSnippetToBeFormatted({
       snippet: "{ }",
       expectedOutput: "{}",
-      entryPoint: "arrayInitializer"
+      entryPoint: "arrayInitializer",
     });
   });
 
   it("can format a arrayInitializer", () => {
     expectSnippetToBeFormatted({
       snippet: "{alpha}",
       expectedOutput: "{ alpha }",
-      entryPoint: "arrayInitializer"
+      entryPoint: "arrayInitializer",
     });
   });
 
@@ -22,14 +22,14 @@ describe("Arrays Initializer", () => {
       expectSnippetToBeFormatted({
         snippet: "{alpha,}",
         expectedOutput: "{ alpha }",
-        entryPoint: "arrayInitializer"
+        entryPoint: "arrayInitializer",
       });
     });
 
     it("should remove extra comma in arrayInitializer by default", () => {
       const snippet = "{oneVeryLongArrayValue,}";
       const prettierOptions = {
-        printWidth: 15
+        printWidth: 15,
       };
       // prettier-ignore
       const expectedOutput =
@@ -41,7 +41,7 @@ describe("Arrays Initializer", () => {
         snippet,
         expectedOutput,
         entryPoint: "arrayInitializer",
-        prettierOptions
+        prettierOptions,
       });
     });
 
@@ -51,8 +51,8 @@ describe("Arrays Initializer", () => {
         expectedOutput: "{ oneVeryLongArrayValue }",
         entryPoint: "arrayInitializer",
         prettierOptions: {
-          trailingComma: "all"
-        }
+          trailingComma: "all",
+        },
       });
     });
 
@@ -62,8 +62,8 @@ describe("Arrays Initializer", () => {
         expectedOutput: "{ oneVeryLongArrayValue }",
         entryPoint: "arrayInitializer",
         prettierOptions: {
-          trailingComma: "all"
-        }
+          trailingComma: "all",
+        },
       });
     });
 
@@ -80,8 +80,8 @@ describe("Arrays Initializer", () => {
         entryPoint: "arrayInitializer",
         prettierOptions: {
           printWidth: 15,
-          trailingComma: "all"
-        }
+          trailingComma: "all",
+        },
       });
     });
 
@@ -98,8 +98,8 @@ describe("Arrays Initializer", () => {
         entryPoint: "arrayInitializer",
         prettierOptions: {
           printWidth: 15,
-          trailingComma: "all"
-        }
+          trailingComma: "all",
+        },
       });
     });
   });

packages/prettier-plugin-java/test/unit-test/snippets/arrays/variable-initializer-list.spec.ts

@@ -5,15 +5,15 @@ describe("VariableInitializerList", () => {
     expectSnippetToBeFormatted({
       snippet: "alpha ",
       expectedOutput: "alpha",
-      entryPoint: "variableInitializerList"
+      entryPoint: "variableInitializerList",
     });
   });
 
   it("format variableInitializerList with multiple variableInitializer", () => {
     expectSnippetToBeFormatted({
       snippet: "alpha,beta, gamma",
       expectedOutput: "alpha,\nbeta,\ngamma",
-      entryPoint: "variableInitializerList"
+      entryPoint: "variableInitializerList",
     });
   });
 });

packages/prettier-plugin-java/test/unit-test/snippets/blocks-and-statements/switch.spec.ts

@@ -22,7 +22,7 @@ describe("Switches", () => {
       expectSnippetToBeFormatted({
         snippet,
         expectedOutput,
-        entryPoint: "switchStatement"
+        entryPoint: "switchStatement",
       });
     });
   });

packages/prettier-plugin-java/test/unit-test/snippets/classes/class-body.spec.ts

@@ -5,7 +5,7 @@ describe("Class Body", () => {
     expectSnippetToBeFormatted({
       snippet: "{ }",
       expectedOutput: "{}",
-      entryPoint: "classBody"
+      entryPoint: "classBody",
     });
   });
 
@@ -19,7 +19,7 @@ describe("Class Body", () => {
     expectSnippetToBeFormatted({
       snippet: "{int i;}",
       expectedOutput,
-      entryPoint: "classBody"
+      entryPoint: "classBody",
     });
   });
 
@@ -45,7 +45,7 @@ describe("Class Body", () => {
     expectSnippetToBeFormatted({
       snippet,
       expectedOutput,
-      entryPoint: "classBody"
+      entryPoint: "classBody",
     });
   });
 
@@ -71,7 +71,7 @@ describe("Class Body", () => {
     expectSnippetToBeFormatted({
       snippet,
       expectedOutput,
-      entryPoint: "classBody"
+      entryPoint: "classBody",
     });
   });
 
@@ -101,7 +101,7 @@ describe("Class Body", () => {
     expectSnippetToBeFormatted({
       snippet,
       expectedOutput,
-      entryPoint: "classBody"
+      entryPoint: "classBody",
     });
   });
 
@@ -110,7 +110,7 @@ describe("Class Body", () => {
       expectSnippetToBeFormatted({
         snippet: "{;;}",
         expectedOutput: "{}",
-        entryPoint: "classBody"
+        entryPoint: "classBody",
       });
     });
 
@@ -139,7 +139,7 @@ describe("Class Body", () => {
       expectSnippetToBeFormatted({
         snippet,
         expectedOutput,
-        entryPoint: "classBody"
+        entryPoint: "classBody",
       });
     });
 
@@ -170,15 +170,15 @@ describe("Class Body", () => {
       expectSnippetToBeFormatted({
         snippet,
         expectedOutput,
-        entryPoint: "classBody"
+        entryPoint: "classBody",
       });
     });
 
     it("should print comments attached to empty statement where only empty statements", () => {
       expectSnippetToBeFormatted({
         snippet: "{;/* TODO */;}",
         expectedOutput: "{\n" + "  /* TODO */\n" + "}",
-        entryPoint: "classBody"
+        entryPoint: "classBody",
       });
     });
 
@@ -208,7 +208,7 @@ describe("Class Body", () => {
       expectSnippetToBeFormatted({
         snippet,
         expectedOutput,
-        entryPoint: "classBody"
+        entryPoint: "classBody",
       });
     });
   });