Skip to content

reference calls freeze the ide #39

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 2 commits into from
Apr 24, 2013
Merged

reference calls freeze the ide #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23e6e08
every reference calls freeze the ide, so dont use it anymore. see WI-…
Haehnchen Apr 24, 2013
f888248
cleanup unused imports
Haehnchen Apr 24, 2013
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
10 changes: 4 additions & 6 deletions src/fr/adrienbrault/idea/symfony2plugin/Symfony2InterfacesUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.jetbrains.php.PhpIndex;
import com.jetbrains.php.lang.psi.elements.Method;
import com.jetbrains.php.lang.psi.elements.MethodReference;
Expand Down Expand Up @@ -58,17 +59,14 @@ protected boolean isCallTo(PsiElement e, Method[] expectedMethods, int deepness)
return false;
}

PsiElement resolvedReference = methodRef.getReference().resolve();
if (!(resolvedReference instanceof Method)) {
PhpClass methodClass = PsiTreeUtil.getParentOfType(e, PhpClass.class);
if(null == methodClass) {
return false;
}

Method method = (Method) resolvedReference;
PhpClass methodClass = method.getContainingClass();

for (Method expectedMethod : Arrays.asList(expectedMethods)) {
if (null != expectedMethod
&& expectedMethod.getName().equals(method.getName())
&& expectedMethod.getName().equals(methodRef.getName())
&& isInstanceOf(methodClass, expectedMethod.getContainingClass())) {
return true;
}
Expand Down