fix(attributes): remove extra line break (#1890)

Fixes #1884

Author: czosel

src/printer.js

@@ -1214,14 +1214,14 @@ function printAttrs(path, options, print, { inline = false } = {}) {
   }
   path.each((agPath) => {
     const attrGroup = ["#["];
-    if (allAttrs.length > 0) {
-      allAttrs.push(inline ? " " : hardline);
+    if (!inline && allAttrs.length > 0) {
+      allAttrs.push(hardline);
     }
-    attrGroup.push(ifBreak(softline));
+    attrGroup.push(softline);
     agPath.each((attrPath) => {
       const attrNode = attrPath.getValue();
       if (attrGroup.length > 2) {
-        attrGroup.push(",", ifBreak(softline, " "));
+        attrGroup.push(",", line);
       }
       const attrStmt = [attrNode.name];
       if (attrNode.args.length > 0) {
@@ -1234,10 +1234,9 @@ function printAttrs(path, options, print, { inline = false } = {}) {
         concat([
           indent(concat(attrGroup)),
           ifBreak(shouldPrintComma(options, "8.0") ? "," : ""),
-          ifBreak(softline),
-          "]",
           softline,
-          inline ? " " : "",
+          "]",
+          inline ? ifBreak(softline, " ") : "",
         ])
       )
     );

tests/attributes-trail-comma/__snapshots__/jsfmt.spec.js.snap

@@ -40,7 +40,6 @@ final class ORM
     ),
     X,
 ]
-
 final class ORM
 {
     #[
@@ -49,7 +48,6 @@ final class ORM
         ORM\\GeneratedValue(strategy: "CUSTOM"),
         ORM\\Id,
     ]
-
     private string $id;
 }
 

tests/attributes/__snapshots__/jsfmt.spec.js.snap

@@ -81,7 +81,7 @@ class D
      */
     #[I, J]
     function k(#[L] int $m): callable {
-        return #[N, O]  #[P] fn(#[Q] int $r) => $r * 2;
+        return #[N, O] #[P] fn(#[Q] int $r) => $r * 2;
     } //Testing T
 
     // Testing S
@@ -110,15 +110,14 @@ class D
     ),
     X
 ]
-
 function Y(
     #[
         ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ(
             12345678,
             1234578
         )
     ]
-     string $_
+    string $_
 ): string {
     return new #[NON, Anon] class {};
 }
@@ -127,7 +126,6 @@ function Y(
     IA("interface"),
     \\Looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong\\Namespace\\WithStuff\\IB
 ]
-
 interface IC
 {
     #[ID]