WIP Fix for multiple inline expressions

Currently breaks outputing an inline comment closes #2022
prettier · Oct 17, 2022 · f120755 · f120755
1 parent 12329a4
commit f120755
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/src/printer.js b/src/printer.js
@@ -1034,10 +1034,13 @@ function printLines(path, options, print, childrenAttribute = "children") {
     }
 
     if (isInlineNode) {
-      const openTag =
-        nextNode && nextNode.kind === "echo" && nextNode.shortForm
-          ? "<?="
-          : "<?php";
+      const shortOpenTag =
+        nextNode && nextNode.kind === "echo" && nextNode.shortForm;
+      if (shortOpenTag) {
+        parts.push(concat(["<?=", " ", printed, " ", "?>"]));
+        return;
+      }
+      const openTag = shortOpenTag ? "<?=" : "<?php";
       const beforeInline =
         childNode.leadingComments && childNode.leadingComments.length
           ? concat([

diff --git a/tests/inline/__snapshots__/jsfmt.spec.js.snap b/tests/inline/__snapshots__/jsfmt.spec.js.snap
@@ -2532,3 +2532,18 @@ printWidth: 80
 
 ================================================================================
 `;
+
+exports[`shorthand-2.php 1`] = `
+====================================options=====================================
+parsers: ["php"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<?= $var1 ?><?= $var2 ?>
+
+=====================================output=====================================
+<?= $var1 ?><?=
+$var2 ?>
+
+================================================================================
+`;
diff --git a/tests/inline/shorthand-2.php b/tests/inline/shorthand-2.php
@@ -0,0 +1 @@
+<?= $var1 ?><?= $var2 ?>