fix: heredoc/nowdoc trailing newlines (#1295)

Author: czosel

src/util.js

@@ -277,10 +277,10 @@ function isDocNode(node) {
  * Heredoc/Nowdoc nodes need a trailing linebreak if they
  * appear as function arguments or array elements
  */
-function docShouldHaveTrailingNewline(path) {
-  const node = path.getValue();
-  const parent = path.getParentNode();
-  const parentParent = path.getParentNode(1);
+function docShouldHaveTrailingNewline(path, recurse = 0) {
+  const node = path.getNode(recurse);
+  const parent = path.getNode(recurse + 1);
+  const parentParent = path.getNode(recurse + 2);
 
   if (!parent) {
     return false;
@@ -319,11 +319,9 @@ function docShouldHaveTrailingNewline(path) {
   }
 
   if (parent.kind === "bin") {
-    if (parentParent && parentParent.kind === "bin") {
-      return true;
-    }
-
-    return parent.left === node;
+    return (
+      parent.left === node || docShouldHaveTrailingNewline(path, recurse + 1)
+    );
   }
 
   if (parent.kind === "case" && parent.test === node) {
@@ -369,6 +367,10 @@ function docShouldHaveTrailingNewline(path) {
     return index !== lastIndex;
   }
 
+  if (parent.kind === "retif") {
+    return docShouldHaveTrailingNewline(path, recurse + 1);
+  }
+
   return false;
 }
 

tests/nowdoc/__snapshots__/jsfmt.spec.js.snap

@@ -929,8 +929,7 @@ string
 string
 string
 EOD
-    ,
-    $var
+    , $var
 );
 
 $array = [
@@ -958,6 +957,33 @@ $php73FlexibleNowdoc2 = <<<'EOD'
     c
   EOD;
 
+[
+    $var ? "foo" : <<<'EOD'
+string
+EOD
+    , "bar"
+];
+
+[
+    $var ? "foo" : $var2 ? "bar" : <<<'EOD'
+string
+EOD
+    , "bar"
+];
+
+[
+    $var ??  <<<'EOD'
+string
+EOD
+    , "bar"
+];
+
+[
+    $a ?? $b ??  <<<'EOD'
+string
+EOD
+    , "bar"
+];
 =====================================output=====================================
 <?php
 
@@ -1998,6 +2024,47 @@ $php73FlexibleNowdoc2 = <<<'EOD'
   c
 EOD;
 
+[
+    $var
+        ? "foo"
+        : <<<'EOD'
+string
+EOD
+        ,
+    "bar",
+];
+
+[
+    ($var
+            ? "foo"
+            : $var2)
+        ? "bar"
+        : <<<'EOD'
+string
+EOD
+        ,
+    "bar",
+];
+
+[
+    $var ??
+    <<<'EOD'
+string
+EOD
+    ,
+    "bar",
+];
+
+[
+    $a ??
+    ($b ??
+        <<<'EOD'
+string
+EOD
+        ),
+    "bar",
+];
+
 ================================================================================
 `;
 

tests/nowdoc/nowdoc.php

@@ -921,8 +921,7 @@ function generator()
 string
 string
 EOD
-    ,
-    $var
+    , $var
 );
 
 $array = [
@@ -949,3 +948,31 @@ function generator()
      b
     c
   EOD;
+
+[
+    $var ? "foo" : <<<'EOD'
+string
+EOD
+    , "bar"
+];
+
+[
+    $var ? "foo" : $var2 ? "bar" : <<<'EOD'
+string
+EOD
+    , "bar"
+];
+
+[
+    $var ??  <<<'EOD'
+string
+EOD
+    , "bar"
+];
+
+[
+    $a ?? $b ??  <<<'EOD'
+string
+EOD
+    , "bar"
+];