From adc56671d7fb11d6a4ccb3d88db1f04bde12e6c2 Mon Sep 17 00:00:00 2001
From: Dextheking1 <Dextheking1@users.noreply.github.com>
Date: Fri, 23 Oct 2026 10:46:55 +0000
Subject: [PATCH] fix: do not insert an extra <?php before a comment after a
 control structure

---
 src/printer.mjs                               |  6 +-
 .../__snapshots__/jsfmt.spec.mjs.snap         | 65 +++++++++++++++++++
 tests/inline-comment-after-if/braces.php      |  5 ++
 tests/inline-comment-after-if/if.php          |  4 ++
 tests/inline-comment-after-if/jsfmt.spec.mjs  |  1 +
 tests/inline-comment-after-if/while.php       |  4 ++
 6 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 tests/inline-comment-after-if/__snapshots__/jsfmt.spec.mjs.snap
 create mode 100644 tests/inline-comment-after-if/braces.php
 create mode 100644 tests/inline-comment-after-if/if.php
 create mode 100644 tests/inline-comment-after-if/jsfmt.spec.mjs
 create mode 100644 tests/inline-comment-after-if/while.php

diff --git a/src/printer.mjs b/src/printer.mjs
index a9f06c170..5d6807ab6 100644
--- a/src/printer.mjs
+++ b/src/printer.mjs
@@ -1039,9 +1039,9 @@ function printLines(path, options, print, childrenAttribute = "children") {
       const beforeInline =
         childNode.leadingComments && childNode.leadingComments.length
           ? [
-              isFirstNode && node.kind !== "namespace" && !isBlockNestedNode
-                ? "<?php"
-                : "",
+              // Only a program can start with no open tag; blocks and declares
+              // are printed inside an already open <?php region.
+              isFirstNode && node.kind === "program" ? "<?php" : "",
               node.kind === "namespace" || !isBlockNestedNode ? hardline : "",
               printComments(childNode.leadingComments, options),
               hardline,
diff --git a/tests/inline-comment-after-if/__snapshots__/jsfmt.spec.mjs.snap b/tests/inline-comment-after-if/__snapshots__/jsfmt.spec.mjs.snap
new file mode 100644
index 000000000..40c1a40db
--- /dev/null
+++ b/tests/inline-comment-after-if/__snapshots__/jsfmt.spec.mjs.snap
@@ -0,0 +1,65 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`braces.php 1`] = `
+====================================options=====================================
+parsers: ["php"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<?php if (true) { // brace comment
+  ?>
+  <p>x</p>
+  <?php
+} ?>
+
+=====================================output=====================================
+<?php if (true) {
+    // brace comment
+    ?>
+  <p>x</p>
+  <?php } ?>
+
+================================================================================
+`;
+
+exports[`if.php 1`] = `
+====================================options=====================================
+parsers: ["php"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<?php if (true): // example comment
+  ?>
+  <h1>Heading</h1>
+<?php endif; ?>
+
+=====================================output=====================================
+<?php if (true):
+    // example comment
+    ?>
+  <h1>Heading</h1>
+<?php endif; ?>
+
+================================================================================
+`;
+
+exports[`while.php 1`] = `
+====================================options=====================================
+parsers: ["php"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<?php while (have_posts()): // loop comment
+  ?>
+  <p>post</p>
+<?php endwhile; ?>
+
+=====================================output=====================================
+<?php while (have_posts()):
+    // loop comment
+    ?>
+  <p>post</p>
+<?php endwhile; ?>
+
+================================================================================
+`;
diff --git a/tests/inline-comment-after-if/braces.php b/tests/inline-comment-after-if/braces.php
new file mode 100644
index 000000000..462a74fa7
--- /dev/null
+++ b/tests/inline-comment-after-if/braces.php
@@ -0,0 +1,5 @@
+<?php if (true) { // brace comment
+  ?>
+  <p>x</p>
+  <?php
+} ?>
diff --git a/tests/inline-comment-after-if/if.php b/tests/inline-comment-after-if/if.php
new file mode 100644
index 000000000..4d1d87990
--- /dev/null
+++ b/tests/inline-comment-after-if/if.php
@@ -0,0 +1,4 @@
+<?php if (true): // example comment
+  ?>
+  <h1>Heading</h1>
+<?php endif; ?>
diff --git a/tests/inline-comment-after-if/jsfmt.spec.mjs b/tests/inline-comment-after-if/jsfmt.spec.mjs
new file mode 100644
index 000000000..8829c872f
--- /dev/null
+++ b/tests/inline-comment-after-if/jsfmt.spec.mjs
@@ -0,0 +1 @@
+run_spec(import.meta, ["php"]);
diff --git a/tests/inline-comment-after-if/while.php b/tests/inline-comment-after-if/while.php
new file mode 100644
index 000000000..53812af44
--- /dev/null
+++ b/tests/inline-comment-after-if/while.php
@@ -0,0 +1,4 @@
+<?php while (have_posts()): // loop comment
+  ?>
+  <p>post</p>
+<?php endwhile; ?>