Skip to content

Better method call detection #11

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

Merged
merged 3 commits into from
Feb 11, 2025
Merged

Better method call detection #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3972812
find nearest class def
joetannenbaum Feb 11, 2025
009c486
Update MemberAccessExpressionParser.php
joetannenbaum Feb 11, 2025
f78306a
check child parent not node parent
joetannenbaum Feb 11, 2025
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
9 changes: 9 additions & 0 deletions app/Contexts/AbstractContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,15 @@ public function addPropertyToNearestClassDefinition(string $name, $types = [])
}
}

public function nearestClassDefinition()
{
if ($this instanceof ClassDefinition) {
return $this;
}

return $this->parent?->nearestClassDefinition() ?? null;
}

public function searchForProperty(string $name)
{
if ($this instanceof ClassDefinition) {
Expand Down
12 changes: 12 additions & 0 deletions app/Parsers/MemberAccessExpressionParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use App\Contexts\AbstractContext;
use App\Contexts\AssignmentValue;
use App\Contexts\MethodCall;
use Microsoft\PhpParser\Node\Expression\CallExpression;
use Microsoft\PhpParser\Node\Expression\MemberAccessExpression;
use Microsoft\PhpParser\Node\Expression\Variable;
use Microsoft\PhpParser\Node\QualifiedName;
Expand All @@ -29,6 +30,17 @@ public function parse(MemberAccessExpression $node)

if ($child instanceof Variable) {
if ($child->getName() === 'this') {
if ($child->getParent()->getParent() instanceof CallExpression) {
// They are calling a method on the current class
$result = $this->context->nearestClassDefinition();

if ($result) {
$this->context->className = $result->className;
}

continue;
}

$propName = $child->getParent()->memberName->getFullText($node->getRoot()->getFullText());

$result = $this->context->searchForProperty($propName);
Expand Down