liquidsoap-prettier 1.6.0 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "liquidsoap-prettier",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Liquidsoap language prettier CLI and plugin",
   "type": "module",
   "main": "src/index.js",

package/src/cli.js

@@ -15,8 +15,10 @@ const run = async () => {
       w,
       check,
       c,
+      "print-width": printWidth = 80,
     } = parseArgs(process.argv.slice(2), {
       boolean: ["w", "write", "c", "check"],
+      number: ["print-width"],
     });
 
     if (!filename) {
@@ -53,12 +55,14 @@ const run = async () => {
           const isFormatted = await prettier.check(code, {
             parser: "liquidsoap",
             plugins: [prettierPluginLiquidsoap],
+            printWidth,
           });
           exitCode = isFormatted ? 0 : 2;
         } else {
           const formattedCode = await prettier.format(code, {
             parser: "liquidsoap",
             plugins: [prettierPluginLiquidsoap],
+            printWidth,
           });
 
           if (write || w) {

package/src/index.js

@@ -44,9 +44,7 @@ const printString = (str) => {
     str
       .replace(/\\\n\s*/g, "")
       .split(/(\s)/)
-      .map((s) =>
-        s === " " ? ifBreak(group([" ", "\\", hardline, " "]), " ") : s,
-      ),
+      .map((s) => (s === " " ? ifBreak([" ", "\\", hardline, " "], " ") : s)),
   );
 };
 
@@ -202,8 +200,7 @@ const print = (path, options, print) => {
     group([...printLabel(), ...(node.default ? ["=", print("default")] : [])]);
 
   const printAppArg = () => {
-    if (node.label)
-      return group([node.label, "=", indent([softline, print("value")])]);
+    if (node.label) return group([node.label, "=", print("value")]);
     return print("value");
   };
 
@@ -334,13 +331,9 @@ const print = (path, options, print) => {
       case "while":
         return group([
           "while",
-          line,
-          print("condition"),
-          line,
+          group([indent([line, print("condition")]), line]),
           "do",
-          line,
-          print("loop"),
-          line,
+          group([indent([line, print("loop")]), line]),
           "end",
         ]);
       case "for":
@@ -518,17 +511,23 @@ const print = (path, options, print) => {
       case "app_arg":
         return printAppArg();
       case "app":
-        return group([
-          print("op"),
-          "(",
-          ...(node.args.length === 0
-            ? []
-            : [
-                indent([softline, group([joinWithComments([","], "args")])]),
-                softline,
-              ]),
-          ")",
-        ]);
+        if (node.args.length === 0) {
+          return group([print("op"), "(", ")"]);
+        }
+
+        // Print all arguments
+        const printedArgs = path.map(print, "args");
+
+        // Try to format on a single line first
+        const singleLine = join(", ", printedArgs);
+
+        // Format with line breaks
+        const multiLine = [
+          indent([line, join([",", line], printedArgs)]),
+          line,
+        ];
+
+        return group([print("op"), "(", ifBreak(multiLine, singleLine), ")"]);
       case "eof":
         return "";
       case "seq":