Skip to content

#1706 fix method references and multi resolve #1797

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 1 commit into from
Apr 6, 2022
Merged

#1706 fix method references and multi resolve #1797

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
18 changes: 14 additions & 4 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.jetbrains.php.lang.psi.elements.impl.PhpDefineImpl;
import com.jetbrains.php.lang.psi.resolve.types.PhpType;
import com.jetbrains.php.lang.psi.stubs.indexes.expectedArguments.PhpExpectedFunctionArgument;
import com.jetbrains.php.lang.psi.stubs.indexes.expectedArguments.PhpExpectedFunctionArgumentsRegistry;
import com.jetbrains.php.lang.psi.stubs.indexes.expectedArguments.PhpExpectedFunctionScalarArgument;
import com.jetbrains.php.phpunit.PhpUnitUtil;
import com.jetbrains.php.refactoring.PhpAliasImporter;
Expand Down Expand Up @@ -1230,14 +1231,23 @@ public static PhpClass getClassInsideNamespaceScope(@NotNull Project project, @N
* Resolves MethodReference and compare containing class against implementations instances
*/
public static boolean isMethodReferenceInstanceOf(@NotNull MethodReference methodReference, @NotNull String expectedClassName) {
for (ResolveResult resolveResult : methodReference.multiResolve(false)) {
PsiElement resolve = resolveResult.getElement();
PhpIndex instance = PhpIndex.getInstance(methodReference.getProject());
PhpType classType = (new PhpType()).add(methodReference.getClassReference()).global(methodReference.getProject());

if(!(resolve instanceof Method)) {
Collection<PhpClass> instanceClasses = classType.getTypes()
.stream()
.flatMap((fqn) -> instance.getAnyByFQN(fqn).stream())
.distinct()
.collect(Collectors.toList());

for (PhpClass phpClass : instanceClasses) {
Method method = phpClass.findMethodByName(methodReference.getName());
if (method == null) {
continue;
}

PhpClass containingClass = ((Method) resolve).getContainingClass();
// different class possible
PhpClass containingClass = method.getContainingClass();
if(containingClass == null) {
continue;
}
Expand Down