php class resolver - fixes

maxfilatov · Jan 11, 2016 · 3c1a6db · 3c1a6db
1 parent 1725da4
commit 3c1a6db
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 38 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2" url="https://github.com/maxfilatov/phpuaca/">
     <id>com.phpuaca</id>
     <name>PHPUnit Autocomplete Assistant</name>
-    <version>1.3.0-unstable</version>
+    <version>1.3.0-unstable-5</version>
     <vendor url="https://github.com/maxfilatov/phpuaca/">Max Filatov</vendor>
 
     <description><![CDATA[

diff --git a/src/com/phpuaca/completion/PHPUnitTypeProvider.java b/src/com/phpuaca/completion/PHPUnitTypeProvider.java
@@ -86,7 +86,7 @@ protected String getTypeForMockBuilder(@NotNull MethodReference methodReference)
             return null;
         }
 
-        PhpClass phpClass = (new PhpClassResolver()).resolveByParameterListContainingClassReference(mockBuilderMethodReference.getParameterList());
+        PhpClass phpClass = (new PhpClassResolver()).resolveByMethodReferenceContainingParameterListWithClassReference(mockBuilderMethodReference);
         if (phpClass == null) {
             return null;
         }
@@ -96,7 +96,7 @@ protected String getTypeForMockBuilder(@NotNull MethodReference methodReference)
 
     @Nullable
     protected String getTypeForTestCase(@NotNull MethodReference methodReference) {
-        PhpClass phpClass = (new PhpClassResolver()).resolveByParameterListContainingClassReference(methodReference.getParameterList());
+        PhpClass phpClass = (new PhpClassResolver()).resolveByMethodReferenceContainingParameterListWithClassReference(methodReference);
         if (phpClass == null) {
             return null;
         }

diff --git a/src/com/phpuaca/completion/ProphecyTypeProvider.java b/src/com/phpuaca/completion/ProphecyTypeProvider.java
@@ -3,7 +3,10 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.jetbrains.php.PhpIndex;
-import com.jetbrains.php.lang.psi.elements.*;
+import com.jetbrains.php.lang.psi.elements.Method;
+import com.jetbrains.php.lang.psi.elements.MethodReference;
+import com.jetbrains.php.lang.psi.elements.PhpClass;
+import com.jetbrains.php.lang.psi.elements.PhpNamedElement;
 import com.phpuaca.util.PhpClassAdapter;
 import com.phpuaca.util.PhpClassResolver;
 import com.phpuaca.util.PhpMethodResolver;
@@ -77,8 +80,7 @@ public Collection<? extends PhpNamedElement> getBySignature(String s, Project pr
 
     @Nullable
     protected String getTypeForProphesize(@NotNull MethodReference methodReference) {
-        ParameterList parameterList = methodReference.getParameterList();
-        PhpClass phpClass = (new PhpClassResolver()).resolveByParameterListContainingClassReference(parameterList);
+        PhpClass phpClass = (new PhpClassResolver()).resolveByMethodReferenceContainingParameterListWithClassReference(methodReference);
         if (phpClass == null) {
             return null;
         }

diff --git a/src/com/phpuaca/filter/Filter.java b/src/com/phpuaca/filter/Filter.java
@@ -1,6 +1,5 @@
 package com.phpuaca.filter;
 
-import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocMethod;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocProperty;
 import com.jetbrains.php.lang.psi.elements.Field;
 import com.jetbrains.php.lang.psi.elements.Method;

diff --git a/src/com/phpuaca/filter/MethodMockFilter.java b/src/com/phpuaca/filter/MethodMockFilter.java
@@ -1,31 +1,17 @@
 package com.phpuaca.filter;
 
-import com.intellij.psi.util.PsiTreeUtil;
-import com.jetbrains.php.lang.psi.elements.*;
-import com.phpuaca.filter.util.ClassFinder;
+import com.jetbrains.php.lang.psi.elements.MethodReference;
+import com.jetbrains.php.lang.psi.elements.PhpClass;
+import com.jetbrains.php.lang.psi.elements.PhpModifier;
 import com.phpuaca.util.PhpClassResolver;
 
 public class MethodMockFilter extends Filter {
 
     public MethodMockFilter(FilterContext context) {
         super(context);
 
-        PhpClass phpClass = null;
-        ParameterList parameterList = context.getMethodReference().getParameterList();
-        ClassConstantReference classConstantReference = PsiTreeUtil.getChildOfType(parameterList, ClassConstantReference.class);
-        if (classConstantReference == null) {
-            // MethodMock::callProtectedMethod($Variable, 'doSomething');
-            Variable variable = PsiTreeUtil.getChildOfType(parameterList, Variable.class);
-            if (variable != null) {
-                ClassFinder.Result classFinderResult = (new ClassFinder()).find(variable);
-                if (classFinderResult != null) {
-                    phpClass = classFinderResult.getPhpClass();
-                }
-            }
-        } else {
-            phpClass = (new PhpClassResolver()).resolveByClassConstantReference(classConstantReference);
-        }
-
+        MethodReference methodReference = context.getMethodReference();
+        PhpClass phpClass = (new PhpClassResolver()).resolveByMethodReferenceContainingParameterListWithClassReference(methodReference);
         if (phpClass == null) {
             return;
         }

diff --git a/src/com/phpuaca/filter/util/ClassFinder.java b/src/com/phpuaca/filter/util/ClassFinder.java
@@ -1,7 +1,6 @@
 package com.phpuaca.filter.util;
 
 import com.jetbrains.php.lang.psi.elements.MethodReference;
-import com.jetbrains.php.lang.psi.elements.ParameterList;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.jetbrains.php.lang.psi.elements.Variable;
 import com.phpuaca.filter.FilterConfigItem;
@@ -35,8 +34,7 @@ public Result find(@NotNull MethodReference methodReference) {
             return null;
         }
 
-        ParameterList parameterList = mockBuilderMethodReference.getParameterList();
-        PhpClass phpClass = (new PhpClassResolver()).resolveByParameterListContainingClassReference(parameterList);
+        PhpClass phpClass = (new PhpClassResolver()).resolveByMethodReferenceContainingParameterListWithClassReference(mockBuilderMethodReference);
         if (phpClass == null) {
             return null;
         }

diff --git a/src/com/phpuaca/util/PhpClassResolver.java b/src/com/phpuaca/util/PhpClassResolver.java
@@ -1,9 +1,11 @@
 package com.phpuaca.util;
 
 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.*;
+import com.phpuaca.filter.util.ClassFinder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -43,17 +45,44 @@ public PhpClass resolveByClassStringLiteralExpression(@NotNull StringLiteralExpr
     }
 
     @Nullable
-    public PhpClass resolveByParameterListContainingClassReference(@Nullable ParameterList parameterList) {
-        ClassConstantReference classConstantReference = PsiTreeUtil.getChildOfType(parameterList, ClassConstantReference.class);
-        if (classConstantReference != null) {
-            return resolveByClassConstantReference(classConstantReference);
-        } else {
-            StringLiteralExpression stringLiteralExpression = PsiTreeUtil.getChildOfType(parameterList, StringLiteralExpression.class);
-            if (stringLiteralExpression != null) {
-                return resolveByClassStringLiteralExpression(stringLiteralExpression);
-            }
+    public PhpClass resolveByParameterListContainingClassReference(@NotNull ParameterList parameterList) {
+        PsiElement[] parameters = parameterList.getParameters();
+        if (parameters.length == 0) {
+            return null;
+        }
+
+        if (parameters[0] instanceof ClassConstantReference) {
+            return resolveByClassConstantReference((ClassConstantReference) parameters[0]);
+        }
+
+        if (parameters[0] instanceof StringLiteralExpression) {
+            return resolveByClassStringLiteralExpression((StringLiteralExpression) parameters[0]);
+        }
+
+        if (parameters[0] instanceof Variable) {
+            return resolveByVariable((Variable) parameters[0]);
         }
 
         return null;
     }
+
+    @Nullable
+    public PhpClass resolveByVariable(@NotNull Variable variable) {
+        ClassFinder.Result classFinderResult = (new ClassFinder()).find(variable);
+        if (classFinderResult == null) {
+            return null;
+        }
+
+        return classFinderResult.getPhpClass();
+    }
+
+    @Nullable
+    public PhpClass resolveByMethodReferenceContainingParameterListWithClassReference(@NotNull MethodReference methodReference) {
+        ParameterList parameterList = methodReference.getParameterList();
+        if (parameterList == null) {
+            return null;
+        }
+
+        return resolveByParameterListContainingClassReference(parameterList);
+    }
 }