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

Added completion support to type hinted local variables. #701

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added completion support to type hinted local variables. #701

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
14 changes: 14 additions & 0 deletions src/DefinitionResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,8 +822,22 @@ public function resolveExpressionNodeToType($expr)
}

// ASSIGNMENT EXPRESSION
// first var tag will be used to resolve the type if present
// otherwise
// $a = $myExpression => resolves to the type of the right-hand operand
if ($expr instanceof Node\Expression\AssignmentExpression) {
$declarationNode =
ParserHelpers\tryGetPropertyDeclaration($expr) ??
ParserHelpers\tryGetConstOrClassConstDeclaration($expr);
$declarationNode = $declarationNode ?? $expr;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The double assignments reads very weird - just chain the ?? together

$declarationNode =
    ParserHelpers\tryGetPropertyDeclaration($expr) ??
    ParserHelpers\tryGetConstOrClassConstDeclaration($expr) ??
    $expr;


if (
($docBlock = $this->getDocBlock($declarationNode))
&& !empty($varTags = $docBlock->getTagsByName('var'))
&& ($type = $varTags[0]->getType())
) {
return $type;
}
return $this->resolveExpressionNodeToType($expr->rightOperand);
}

Expand Down