danog/PHP-Parser
1
0
Fork 0
mirror of https://github.com/danog/PHP-Parser.git synced 2024-11-30 04:19:30 +01:00
Code Issues Projects Releases Wiki Activity

Tweak node insertion formatting

Browse Source
This commit is contained in:
Nikita Popov 2017-03-25 21:21:10 +01:00
parent 291bb27f6a
commit 1ec5591574
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/PhpParser/PrettyPrinterAbstract.php
View File

@ -521,6 +521,10 @@ abstract class PrettyPrinterAbstract
} else {
$subStartPos = $pos;
}
if (null === $extraLeft && null !== $extraRight) {
// If inserting on the right only, skipping whitespace looks better
$subStartPos = $this->skipRightWhitespace($subStartPos);
}
$subEndPos = $subStartPos - 1;
}
@ -1128,7 +1132,7 @@ abstract class PrettyPrinterAbstract
'Expr_ArrayItem->key' => [null, null, ' => '],
'Expr_Closure->returnType' => [')', ' : ', null],
'Expr_Ternary->if' => ['?', ' ', ' '],
'Expr_Yield->key' => [T_YIELD, ' ', ' => '],
'Expr_Yield->key' => [T_YIELD, null, ' => '],
'Expr_Yield->value' => [T_YIELD, ' ', null],
'Param->type' => [null, null, ' '],
'Param->default' => [null, ' = ', null],
@ -1136,7 +1140,7 @@ abstract class PrettyPrinterAbstract
'Stmt_ClassMethod->returnType' => [')', ' : ', null],
'Stmt_Class->extends' => [null, ' extends ', null],
'Stmt_Continue->num' => [T_CONTINUE, ' ', null],
'Stmt_Foreach->keyVar' => [T_AS, ' ', ' => '],
'Stmt_Foreach->keyVar' => [T_AS, null, ' => '],
'Stmt_Function->returnType' => [')', ' : ', null],
//'Stmt_If->else' => [null, ' ', null], // TODO
'Stmt_Namespace->name' => [T_NAMESPACE, ' ', null],

8
test/code/formatPreservation/insertionOfNullable.test
View File

@ -114,8 +114,8 @@ $x
:
$y;
yield $k =>
$v ;
yield
$k => $v ;
yield $v ;
break 2
@ -139,8 +139,8 @@ X extends \Bar
foreach (
$x
as $z =>
$y
as
$z => $y
) {}
static