Skip to content

NameImportingPhpDocNodeVisitor: Cheap checks first #4563

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
samsonasik merged 3 commits into from
Jul 21, 2023
Merged

NameImportingPhpDocNodeVisitor: Cheap checks first #4563

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20c64c7
NameImportingPhpDocNodeVisitor: Cheap checks first
staabm Jul 21, 2023
fa5f53f
de-duplicate
staabm Jul 21, 2023
ec8b8b7
don't re-construct FullyQualifiedObjectType if not necessary
staabm Jul 21, 2023
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
19 changes: 6 additions & 13 deletions packages/NodeTypeResolver/PhpDocNodeVisitor/NameImportingPhpDocNodeVisitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ private function processFqnNameImport(
FullyQualifiedObjectType $fullyQualifiedObjectType,
File $file
): ?IdentifierTypeNode {
$parentNode = $identifierTypeNode->getAttribute(PhpDocAttributeKey::PARENT);
if ($parentNode instanceof TemplateTagValueNode) {
// might break
return null;
}

if (str_starts_with($fullyQualifiedObjectType->getClassName(), '@')) {
$fullyQualifiedObjectType = new FullyQualifiedObjectType(ltrim(
$fullyQualifiedObjectType->getClassName(),
Expand All @@ -112,26 +118,13 @@ private function processFqnNameImport(
return null;
}

$parentNode = $identifierTypeNode->getAttribute(PhpDocAttributeKey::PARENT);
Copy link
Copy Markdown
Contributor Author

@staabm staabm Jul 21, 2023

Choose a reason for hiding this comment

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

do this check earlier, as it is fast

if ($parentNode instanceof TemplateTagValueNode) {
// might break
return null;
}

$newNode = new IdentifierTypeNode($fullyQualifiedObjectType->getShortName());

// should skip because its already used
if ($this->useNodesToAddCollector->isShortImported($file, $fullyQualifiedObjectType)) {
if (! $this->useNodesToAddCollector->isImportShortable($file, $fullyQualifiedObjectType)) {
return null;
}

if ($this->shouldImport($newNode, $identifierTypeNode, $fullyQualifiedObjectType)) {
Copy link
Copy Markdown
Contributor Author

@staabm staabm Jul 21, 2023

Choose a reason for hiding this comment

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

the block deleted is identical to the one after the outer IF statement

$this->useNodesToAddCollector->addUseImport($fullyQualifiedObjectType);
return $newNode;
}

return null;
}

if ($this->shouldImport($newNode, $identifierTypeNode, $fullyQualifiedObjectType)) {
Expand Down