From a88a5b75d95cb7d7529b41ea678b3bb073089bf0 Mon Sep 17 00:00:00 2001
From: benjaminkincses <4175097+benjaminkincses@users.noreply.github.com>
Date: Wed, 11 Nov 2026 11:47:13 +0100
Subject: [PATCH 1/3] fix: do not indent returned expression for dangling
 comments

---
 src/printer.mjs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/printer.mjs b/src/printer.mjs
index a9f06c170..5600ba053 100644
--- a/src/printer.mjs
+++ b/src/printer.mjs
@@ -2419,7 +2419,16 @@ function printNode(path, options, print) {
       if (node.expr) {
         const printedExpr = print("expr");
 
-        parts.push(" ", node.expr.comments ? indent(printedExpr) : printedExpr);
+        // Only comments printed around the expression (leading or
+        // trailing) need the extra indent. Dangling comments are printed
+        // by the expression itself at its own indent; wrapping those in
+        // indent() as well shifts them and the closing line one level
+        // too deep, e.g. an array holding only a comment.
+        const shouldIndent =
+          node.expr.comments &&
+          (hasLeadingComment(node.expr) || hasTrailingComment(node.expr));
+
+        parts.push(" ", shouldIndent ? indent(printedExpr) : printedExpr);
       }
 
       if (hasDanglingComments(node)) {

From 0a16cbb9fa2435b55c21c42330556ac1d08064c7 Mon Sep 17 00:00:00 2001
From: benjaminkincses <4175097+benjaminkincses@users.noreply.github.com>
Date: Wed, 11 Nov 2026 11:47:26 +0100
Subject: [PATCH 2/3] test: add comment-only array in return case

---
 tests/array/empty-comment.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 tests/array/empty-comment.php

diff --git a/tests/array/empty-comment.php b/tests/array/empty-comment.php
new file mode 100644
index 000000000..f0c0e8e61
--- /dev/null
+++ b/tests/array/empty-comment.php
@@ -0,0 +1,17 @@
+<?php
+
+return [
+    // TODO: ...
+];
+
+return [
+    // TODO: ...
+    'foo' => 'bar',
+];
+
+function foo()
+{
+    return [
+        // TODO: ...
+    ];
+}

From cdcf6a3c26cb2fe44c8c11203274efb370b85e86 Mon Sep 17 00:00:00 2001
From: benjaminkincses <4175097+benjaminkincses@users.noreply.github.com>
Date: Wed, 11 Nov 2026 11:47:37 +0100
Subject: [PATCH 3/3] test: add snapshots for comment-only array in return

---
 tests/array/__snapshots__/jsfmt.spec.mjs.snap | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/tests/array/__snapshots__/jsfmt.spec.mjs.snap b/tests/array/__snapshots__/jsfmt.spec.mjs.snap
index dc64656e1..a7487ae31 100644
--- a/tests/array/__snapshots__/jsfmt.spec.mjs.snap
+++ b/tests/array/__snapshots__/jsfmt.spec.mjs.snap
@@ -1727,6 +1727,99 @@ $var = array(...new ArrayIterator(array("a", "b", "c")));
 ================================================================================
 `;
 
+exports[`empty-comment.php 1`] = `
+====================================options=====================================
+parsers: ["php"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<?php
+
+return [
+    // TODO: ...
+];
+
+return [
+    // TODO: ...
+    'foo' => 'bar',
+];
+
+function foo()
+{
+    return [
+        // TODO: ...
+    ];
+}
+
+=====================================output=====================================
+<?php
+
+return [
+    // TODO: ...
+];
+
+return [
+    // TODO: ...
+    "foo" => "bar",
+];
+
+function foo()
+{
+    return [
+        // TODO: ...
+    ];
+}
+
+================================================================================
+`;
+
+exports[`empty-comment.php 2`] = `
+====================================options=====================================
+parsers: ["php"]
+phpVersion: "5.3"
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<?php
+
+return [
+    // TODO: ...
+];
+
+return [
+    // TODO: ...
+    'foo' => 'bar',
+];
+
+function foo()
+{
+    return [
+        // TODO: ...
+    ];
+}
+
+=====================================output=====================================
+<?php
+
+return array(
+    // TODO: ...
+);
+
+return array(
+    // TODO: ...
+    "foo" => "bar",
+);
+
+function foo()
+{
+    return array(
+        // TODO: ...
+    );
+}
+
+================================================================================
+`;
+
 exports[`single.php 1`] = `
 ====================================options=====================================
 parsers: ["php"]