From 393f8e6a3386a4e627414d4e0bbba7319047c88b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Marques?= <joao@colegiorecanto.com>
Date: Fri, 23 Oct 2026 09:04:29 -0300
Subject: [PATCH] fix: don't duplicate comments in short-form if blocks and
 after open tags

- php-parser ends the body of a short-form `if` (`if (): ... else: ...
  endif;`) where the whole statement ends, so it overlaps the alternate and
  comments inside the `else:`/`elseif:` branch were printed twice (and once
  more on every run). The body now ends at its last child.
- A comment right after an open tag that follows inline HTML
  (`<div><?php // comment`) was attached as a trailing comment of the inline
  node and printed twice. It is now a leading comment of the next statement.

Fixes #1705
Fixes #2495

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 src/comments.mjs                              |  10 ++
 src/parser.mjs                                |  36 ++++++
 .../__snapshots__/jsfmt.spec.mjs.snap         | 103 +++++++++++++++++-
 tests/comments/inline-open-tag-comment.php    |   9 ++
 tests/comments/inline-short-form-elseif.php   |  11 ++
 tests/comments/inline-short-form-if.php       |  12 ++
 6 files changed, 179 insertions(+), 2 deletions(-)
 create mode 100644 tests/comments/inline-open-tag-comment.php
 create mode 100644 tests/comments/inline-short-form-elseif.php
 create mode 100644 tests/comments/inline-short-form-if.php

diff --git a/src/comments.mjs b/src/comments.mjs
index bc1b8a643..cc1b61524 100644
--- a/src/comments.mjs
+++ b/src/comments.mjs
@@ -691,6 +691,16 @@ function handleInlineComments(
   ) {
     addDanglingComment(precedingNode, comment);
     return true;
+  } else if (
+    precedingNode &&
+    precedingNode.kind === "inline" &&
+    followingNode
+  ) {
+    // A comment right after the open tag (`?>...<?php // comment`) belongs to
+    // the next statement; as a trailing comment of the inline node it would be
+    // printed twice (once by the inline node and once by prettier).
+    addLeadingComment(followingNode, comment);
+    return true;
   }
   return false;
 }
diff --git a/src/parser.mjs b/src/parser.mjs
index 8df49870d..0e34d537c 100644
--- a/src/parser.mjs
+++ b/src/parser.mjs
@@ -61,7 +61,43 @@ function parse(text, opts) {
     }
   });
 
+  fixShortFormIfBodyLoc(ast);
+
   return ast;
 }
 
+// In the short form (`if (): ... else: ... endif;`) php-parser ends the `if`
+// body where the whole statement ends, so it overlaps the alternate. Comments
+// inside the alternate are then claimed by both blocks and printed twice.
+// End the body at its last child instead.
+function fixShortFormIfBodyLoc(node) {
+  if (!node || typeof node !== "object") {
+    return;
+  }
+
+  if (Array.isArray(node)) {
+    node.forEach(fixShortFormIfBodyLoc);
+    return;
+  }
+
+  if (
+    node.kind === "if" &&
+    node.shortForm &&
+    node.alternate &&
+    node.body &&
+    node.body.kind === "block" &&
+    node.body.loc
+  ) {
+    const { body } = node;
+    const lastChild = body.children[body.children.length - 1];
+    body.loc.end = lastChild ? lastChild.loc.end : body.loc.start;
+  }
+
+  for (const key of Object.keys(node)) {
+    if (key !== "loc" && key !== "leadingComments" && key !== "comments") {
+      fixShortFormIfBodyLoc(node[key]);
+    }
+  }
+}
+
 export default parse;
diff --git a/tests/comments/__snapshots__/jsfmt.spec.mjs.snap b/tests/comments/__snapshots__/jsfmt.spec.mjs.snap
index 5adfe5f8c..771fa348f 100644
--- a/tests/comments/__snapshots__/jsfmt.spec.mjs.snap
+++ b/tests/comments/__snapshots__/jsfmt.spec.mjs.snap
@@ -4391,6 +4391,106 @@ some text
 ================================================================================
 `;
 
+exports[`inline-open-tag-comment.php 1`] = `
+====================================options=====================================
+parsers: ["php"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<div>
+    <?php # comment after open tag
+    $a = 1; ?>
+</div>
+
+<?php foreach ($items as $item): ?>
+    <?php // comment after open tag
+    $b = $item; ?>
+<?php endforeach; ?>
+
+=====================================output=====================================
+<div>
+    <?php # comment after open tag
+    $a = 1; ?>
+</div>
+
+<?php foreach ($items as $item): ?>
+    <?php // comment after open tag
+    $b = $item; ?>
+<?php endforeach; ?>
+
+================================================================================
+`;
+
+exports[`inline-short-form-elseif.php 1`] = `
+====================================options=====================================
+parsers: ["php"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<?php if ($a): ?>
+    <p>a</p>
+<?php elseif ($b): ?>
+    <?php
+    $c = 1;
+    # comment in elseif
+    $d = 2;
+    ?>
+<?php else: ?>
+    <p>c</p>
+<?php endif; ?>
+
+=====================================output=====================================
+<?php if ($a): ?>
+    <p>a</p>
+<?php elseif ($b): ?>
+    <?php
+    $c = 1;
+    # comment in elseif
+    $d = 2;
+    ?>
+<?php else: ?>
+    <p>c</p>
+<?php endif; ?>
+
+================================================================================
+`;
+
+exports[`inline-short-form-if.php 1`] = `
+====================================options=====================================
+parsers: ["php"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<?php if ($a): ?>
+    <p>a</p>
+<?php else: ?>
+    <?php
+    $b = 1;
+
+    // comment in else
+    if ($b === 1) {
+        $b = 2;
+    }
+    ?>
+<?php endif; ?>
+
+=====================================output=====================================
+<?php if ($a): ?>
+    <p>a</p>
+<?php else: ?>
+    <?php
+    $b = 1;
+
+    // comment in else
+    if ($b === 1) {
+        $b = 2;
+    }
+    ?>
+<?php endif; ?>
+
+================================================================================
+`;
+
 exports[`inline2.php 1`] = `
 ====================================options=====================================
 parsers: ["php"]
@@ -4627,8 +4727,7 @@ printWidth: 80
 echo "foo"; ?>
 
         <?php //BAR
-
-echo "bar"; ?>
+        echo "bar"; ?>
 
 ================================================================================
 `;
diff --git a/tests/comments/inline-open-tag-comment.php b/tests/comments/inline-open-tag-comment.php
new file mode 100644
index 000000000..1935c680b
--- /dev/null
+++ b/tests/comments/inline-open-tag-comment.php
@@ -0,0 +1,9 @@
+<div>
+    <?php # comment after open tag
+    $a = 1; ?>
+</div>
+
+<?php foreach ($items as $item): ?>
+    <?php // comment after open tag
+    $b = $item; ?>
+<?php endforeach; ?>
diff --git a/tests/comments/inline-short-form-elseif.php b/tests/comments/inline-short-form-elseif.php
new file mode 100644
index 000000000..d18b87732
--- /dev/null
+++ b/tests/comments/inline-short-form-elseif.php
@@ -0,0 +1,11 @@
+<?php if ($a): ?>
+    <p>a</p>
+<?php elseif ($b): ?>
+    <?php
+    $c = 1;
+    # comment in elseif
+    $d = 2;
+    ?>
+<?php else: ?>
+    <p>c</p>
+<?php endif; ?>
diff --git a/tests/comments/inline-short-form-if.php b/tests/comments/inline-short-form-if.php
new file mode 100644
index 000000000..50bcb2c4e
--- /dev/null
+++ b/tests/comments/inline-short-form-if.php
@@ -0,0 +1,12 @@
+<?php if ($a): ?>
+    <p>a</p>
+<?php else: ?>
+    <?php
+    $b = 1;
+
+    // comment in else
+    if ($b === 1) {
+        $b = 2;
+    }
+    ?>
+<?php endif; ?>