added trailing commas to match body when enabled (#1949)

fixes #1948

Author: cseufert

src/printer.js

@@ -3062,7 +3062,11 @@ function printNode(path, options, print) {
             ])
           ),
           ") {",
-          indent(concat(arms)),
+          group(
+            indent(
+              concat([...arms, options.trailingCommaPHP ? ifBreak(",") : ""])
+            )
+          ),
           " ",
           softline,
           "}",

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

@@ -102,7 +102,7 @@ enum Suit implements Colorful
     {
         return match ($this) {
             Suit::Hearts, Suit::Diamonds => "Red",
-            Suit::Clubs, Suit::Spades => "Black"
+            Suit::Clubs, Suit::Spades => "Black",
         };
     }
 

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

@@ -5,6 +5,7 @@ exports[`match.php 1`] = `
 parsers: ["php"]
 phpVersion: "8.0"
 printWidth: 80
+trailingCommaPHP: false
                                                                                 | printWidth
 =====================================input======================================
 <?php
@@ -65,3 +66,70 @@ $nest = match (match ($a) { true => 1,  false => 2 }) {
 
 ================================================================================
 `;
+
+exports[`match.php 2`] = `
+====================================options=====================================
+parsers: ["php"]
+phpVersion: "8.0"
+printWidth: 80
+trailingCommaPHP: true
+                                                                                | printWidth
+=====================================input======================================
+<?php
+
+$really_really_really_long_variable_name = match(getValue()) {
+  true => implode(',',[1,2,3]),
+    false => $a || 'Empty',
+    null => null,
+    default => throw new \\InvalidArgumentException('Unknown Value'),
+};
+
+$boolStr = match($v) {true => 'true', false => 'false'};
+
+$boolish = match($v) {
+    true, 1 => true,
+    false,0,'',null => false,
+    default => null
+};
+
+$a = match(true) {
+    test() => 'Good',
+    test2() => 'Two',
+    default => 'fail'
+};
+
+$nest = match(match($a) {true => 1, false => 2}) {
+    1 => match($b) {
+        'ok' => true,
+        'fail' => false,
+        default => false
+    },
+    2 => 'null'
+};
+=====================================output=====================================
+<?php
+
+$really_really_really_long_variable_name = match (getValue()) {
+    true => implode(",", [1, 2, 3]),
+    false => $a || "Empty",
+    null => null,
+    default => throw new \\InvalidArgumentException("Unknown Value"),
+};
+
+$boolStr = match ($v) { true => "true",  false => "false" };
+
+$boolish = match ($v) {
+    true, 1 => true,
+    false, 0, "", null => false,
+    default => null,
+};
+
+$a = match (true) { test() => "Good",  test2() => "Two",  default => "fail" };
+
+$nest = match (match ($a) { true => 1,  false => 2 }) {
+    1 => match ($b) { "ok" => true,  "fail" => false,  default => false },
+    2 => "null",
+};
+
+================================================================================
+`;

tests/match/jsfmt.spec.js

@@ -1 +1,8 @@
-run_spec(__dirname, ["php"], { phpVersion: "8.0" });
+run_spec(__dirname, ["php"], {
+  trailingCommaPHP: false,
+  phpVersion: "8.0",
+});
+run_spec(__dirname, ["php"], {
+  trailingCommaPHP: true,
+  phpVersion: "8.0",
+});