Skip to content
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

Jump to bottom

Re-work CheckTrivialExprVisitor #10612

Merged
merged 1 commit into from
Jan 29, 2024
Merged

Re-work CheckTrivialExprVisitor #10612

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
2 changes: 1 addition & 1 deletion src/Psalm/Internal/Analyzer/Statements/UnusedAssignmentRemover.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function findUnusedAssignment(
$traverser->addVisitor($visitor);
$traverser->traverse([$rhs_exp]);

$rhs_exp_trivial = (count($visitor->getNonTrivialExpr()) === 0);
$rhs_exp_trivial = !$visitor->hasNonTrivialExpr();

if ($rhs_exp_trivial) {
$treat_as_expr = false;
Expand Down
14 changes: 4 additions & 10 deletions src/Psalm/Internal/PhpVisitor/CheckTrivialExprVisitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
*/
final class CheckTrivialExprVisitor extends PhpParser\NodeVisitorAbstract
{
/**
* @var array<int, PhpParser\Node\Expr>
*/
protected array $non_trivial_expr = [];
private bool $has_non_trivial_expr = false;

private function checkNonTrivialExpr(PhpParser\Node\Expr $node): bool
{
Expand Down Expand Up @@ -55,7 +52,7 @@ public function enterNode(PhpParser\Node $node): ?int
if ($node instanceof PhpParser\Node\Expr) {
// Check for Non-Trivial Expression first
if ($this->checkNonTrivialExpr($node)) {
$this->non_trivial_expr[] = $node;
$this->has_non_trivial_expr = true;
return PhpParser\NodeTraverser::STOP_TRAVERSAL;
}

Expand All @@ -70,11 +67,8 @@ public function enterNode(PhpParser\Node $node): ?int
return null;
}

/**
* @return array<int, PhpParser\Node\Expr>
*/
public function getNonTrivialExpr(): array
public function hasNonTrivialExpr(): bool
{
return $this->non_trivial_expr;
return $this->has_non_trivial_expr;
}
}
Loading