Skip to content

Fix extra PHP opener after short if comment #2532

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
sean0407 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix extra PHP opener after short if comment #2532

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
8 changes: 6 additions & 2 deletions src/printer.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,9 +984,13 @@ function printLines(path, options, print, childrenAttribute = "children") {
const isBlockNestedNode =
node.kind === "block" &&
parentNode &&
["function", "closure", "method", "try", "catch"].includes(
(["function", "closure", "method", "try", "catch"].includes(
parentNode.kind
);
) ||
(parentNode.kind === "if" &&
parentNode.shortForm &&
isInlineNode &&
childNode.leadingComments?.length > 0));

let beforeCloseTagInlineNode = isBlockNestedNode && isFirstNode ? "" : " ";

Expand Down
20 changes: 20 additions & 0 deletions tests/inline/__snapshots__/jsfmt.spec.mjs.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2415,6 +2415,26 @@ printWidth: 80
================================================================================
`;

exports[`mixed-2494.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[`namespace-1.php 1`] = `
====================================options=====================================
parsers: ["php"]
Expand Down
4 changes: 4 additions & 0 deletions tests/inline/mixed-2494.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; ?>