Skip to content

fix: do not insert an extra <?php before a comment after a control structure #2547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dextheking1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: do not insert an extra <?php before a comment after a control structure #2547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/printer.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
65 changes: 65 additions & 0 deletions tests/inline-comment-after-if/__snapshots__/jsfmt.spec.mjs.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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; ?>

================================================================================
`;
5 changes: 5 additions & 0 deletions tests/inline-comment-after-if/braces.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php if (true) { // brace comment
?>
<p>x</p>
<?php
} ?>
4 changes: 4 additions & 0 deletions tests/inline-comment-after-if/if.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?php if (true): // example comment
?>
<h1>Heading</h1>
<?php endif; ?>
1 change: 1 addition & 0 deletions tests/inline-comment-after-if/jsfmt.spec.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
run_spec(import.meta, ["php"]);
4 changes: 4 additions & 0 deletions tests/inline-comment-after-if/while.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?php while (have_posts()): // loop comment
?>
<p>post</p>
<?php endwhile; ?>
Loading