FPPP: Add support for removal from list nodes

nikic · Nov 4, 2017 · 56bc8eb · 56bc8eb
1 parent 361398b
commit 56bc8eb
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 5 deletions.
diff --git a/lib/PhpParser/PrettyPrinterAbstract.php b/lib/PhpParser/PrettyPrinterAbstract.php
@@ -766,8 +766,24 @@ protected function pArray(
                     $result .= $insertStr;
                 }
             } else if ($diffType === DiffElem::TYPE_REMOVE) {
-                // TODO Support remove
-                return null;
+                if ($i === 0) {
+                    // TODO Handle removal at the start
+                    return null;
+                }
+
+                if (!$origArrItem instanceof Node) {
+                    // We only support removal for nodes
+                    return null;
+                }
+
+                $itemEndPos = $origArrItem->getEndTokenPos();
+                if ($itemEndPos < 0) {
+                    // Shouldn't happen
+                    return null;
+                }
+
+                $pos = $itemEndPos + 1;
+                continue;
             } else {
                 throw new \Exception("Shouldn't happen");
             }
@@ -1206,5 +1222,11 @@ protected function initializeModifierChangeMap() {
             'Stmt_Property->flags' => T_VARIABLE,
             //'Stmt_TraitUseAdaptation_Alias->newModifier' => 0, // TODO
         ];
+
+        // List of integer subnodes that are not modifiers:
+        // Expr_Include->type
+        // Stmt_GroupUse->type
+        // Stmt_Use->type
+        // Stmt_UseUse->type
     }
 }
diff --git a/test/code/formatPreservation/abc1.test b/test/code/formatPreservation/abc1.test
@@ -101,11 +101,12 @@ call2(
 $tmp = $stmts[0]->stmts[0];
 $stmts[0]->stmts[0] = $stmts[1];
 $stmts[1] = $tmp;
-// Same test, but also appending to $stms, triggering fallback
-$stmts[] = new Stmt\Echo_([new Scalar\LNumber(42)]);
+// Same test, but also prepending to $stmts, triggering fallback
+array_unshift($stmts, new Stmt\Echo_([new Scalar\LNumber(42)]));
 -----
 <?php
 
+echo 42;
 function test() {
     call2(
         $foo
@@ -114,7 +115,6 @@ function test() {
 call1(
     $bar
 );
-echo 42;
 -----
 <?php
     echo 1;

diff --git a/test/code/formatPreservation/listRemoval.test b/test/code/formatPreservation/listRemoval.test
@@ -0,0 +1,40 @@
+Removing from list nodes
+-----
+<?php $foo; $bar; $baz;
+-----
+array_splice($stmts, 1, 1, []);
+-----
+<?php $foo; $baz;
+-----
+<?php
+function foo(
+    $a,
+    $b,
+    $c
+) {}
+-----
+array_pop($stmts[0]->params);
+-----
+<?php
+function foo(
+    $a,
+    $b
+) {}
+-----
+<?php
+function foo(
+    $a,
+    $b,
+    $c
+) {}
+-----
+array_pop($stmts[0]->params);
+$stmts[0]->params[] = new Node\Param(new Expr\Variable('x'));
+$stmts[0]->params[] = new Node\Param(new Expr\Variable('y'));
+/* TODO The insertion here should try to to honor the style */
+-----
+<?php
+function foo(
+    $a,
+    $b, $x, $y
+) {}