feat(match): Print trailing comments

prettier · Aug 14, 2023 · 353eee8 · 353eee8
1 parent c770afb
commit 353eee8
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 6 deletions.
diff --git a/src/printer.js b/src/printer.js
@@ -2887,11 +2887,25 @@ function printNode(path, options, print) {
  return path.call(print, "name");
  }
  case "match": {
+ const lastArmIndex = node.arms.length - 1;
  const arms = path.map((armPath, armIdx) => {
  const armNode = armPath.getValue();
+
  const maybeLeadingComment = comments.hasLeadingComment(armNode)
  ? [comments.printComments(armNode.leadingComments, options), hardline]
  : [];
+ const maybeTrailingComma =
+ armIdx < lastArmIndex || options.trailingCommaPHP ? "," : "";
+ let maybeTrailingComment = comments.hasTrailingComment(armNode)
+ ? [
+ " ",
+ comments.printComments(
+ armNode.comments.filter((c) => c.trailing),
+ options
+ ),
+ ]
+ : [];
+
  const conds =
  armNode.conds === null
  ? "default"
@@ -2906,19 +2920,26 @@ function printNode(path, options, print) {
  isPreviousLineEmpty(options.originalText, armNode, options)
  ? hardline
  : "";
+
  return [
- ",",
+ "",
  hardline,
  maybeEmptyLineBetweenArms,
  ...maybeLeadingComment,
- group([group([conds, indent(line)]), "=> ", body]),
+ group([
+ group([conds, indent(line)]),
+ "=> ",
+ body,
+ maybeTrailingComma,
+ ...maybeTrailingComment,
+ ]),
  ].slice(armIdx > 0 ? 0 : 1);
  }, "arms");
  return group([
  "match (",
  group([softline, indent(path.call(print, "cond")), softline]),
  ") {",
- group(indent([...arms, options.trailingCommaPHP ? "," : ""])),
+ group(indent([...arms])),
  " ",
  softline,
  "}",

diff --git a/tests/comments/__snapshots__/jsfmt.spec.js.snap b/tests/comments/__snapshots__/jsfmt.spec.js.snap
@@ -4847,7 +4847,11 @@ $withComments = match($v) {
 
 
  'b' => 2,
- default => null
+ // leading comment ...
+ 'c' => 3, /* ... and trailing comment */
+ 'd' // fourth comment
+ => 4,
+ default => null // final comment
 };
 
 =====================================output=====================================
@@ -4861,7 +4865,11 @@ $withComments = match ($v) {
  * second comment
  */
  "b" => 2,
- default => null,
+ // leading comment ...
+ "c" => 3, /* ... and trailing comment */
+ "d" // fourth comment
+ => 4,
+ default => null, // final comment
 };
 
 ================================================================================

diff --git a/tests/comments/match.php b/tests/comments/match.php
@@ -15,5 +15,9 @@
 
 
  'b' => 2,
- default => null
+ // leading comment ...
+ 'c' => 3, /* ... and trailing comment */
+ 'd' // fourth comment
+ => 4,
+ default => null // final comment
 };