#8: type providers - support for interfaces and traits

Author: maxfilatov

src/com/phpuaca/completion/BaseTypeProvider.java

@@ -1,9 +1,7 @@
 package com.phpuaca.completion;
 
 import com.intellij.openapi.project.DumbService;
-import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
-import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.psi.elements.Method;
 import com.jetbrains.php.lang.psi.elements.MethodReference;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
@@ -12,23 +10,12 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
-
 abstract public class BaseTypeProvider implements PhpTypeProvider2 {
 
     protected boolean isAvailable(@NotNull PsiElement psiElement) {
         return (psiElement instanceof MethodReference) && !DumbService.getInstance(psiElement.getProject()).isDumb();
     }
 
-    protected Collection<PhpClass> getPhpInterfaceCollection(@NotNull Project project, String FQN) {
-        return PhpIndex.getInstance(project).getInterfacesByFQN(FQN);
-    }
-
-    @NotNull
-    protected Collection<PhpClass> getPhpClassCollection(@NotNull Project project, String FQN) {
-        return PhpIndex.getInstance(project).getClassesByFQN(FQN);
-    }
-
     @Nullable
     protected PhpClassAdapter getPhpClassAdapterForMethod(@NotNull Method method) {
         PhpClass phpClass = method.getContainingClass();

src/com/phpuaca/completion/PHPUnitTypeProvider.java

@@ -2,6 +2,7 @@
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
+import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.psi.elements.Method;
 import com.jetbrains.php.lang.psi.elements.MethodReference;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
@@ -67,9 +68,10 @@ public String getType(PsiElement psiElement) {
 
     @Override
     public Collection<? extends PhpNamedElement> getBySignature(String s, Project project) {
+        PhpIndex phpIndex = PhpIndex.getInstance(project);
         Collection<PhpClass> collection = new ArrayList<PhpClass>();
-        collection.addAll(getPhpInterfaceCollection(project, CLASS_PHP_UNIT_MOCK_OBJECT));
-        collection.addAll(getPhpClassCollection(project, s));
+        collection.addAll(phpIndex.getInterfacesByFQN(CLASS_PHP_UNIT_MOCK_OBJECT));
+        collection.addAll(phpIndex.getAnyByFQN(s));
         return collection;
     }
 

src/com/phpuaca/completion/ProphecyTypeProvider.java

@@ -2,6 +2,7 @@
 
 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.phpuaca.util.PhpClassAdapter;
 import com.phpuaca.util.PhpClassResolver;
@@ -66,9 +67,10 @@ public String getType(PsiElement psiElement) {
 
     @Override
     public Collection<? extends PhpNamedElement> getBySignature(String s, Project project) {
+        PhpIndex phpIndex = PhpIndex.getInstance(project);
         Collection<PhpClass> collection = new ArrayList<PhpClass>();
         for (String FQN : s.split(TYPE_SEPARATOR)) {
-            collection.addAll(getPhpClassCollection(project, FQN));
+            collection.addAll(phpIndex.getAnyByFQN(FQN));
         }
         return collection;
     }

src/com/phpuaca/util/PhpClassResolver.java

@@ -33,7 +33,7 @@ public PhpClass resolveByClassStringLiteralExpression(@NotNull StringLiteralExpr
         if (!className.isEmpty()) {
             className = className.replace("\\\\", "\\");
             Project project = stringLiteralExpression.getProject();
-            Collection<PhpClass> phpClasses = PhpIndex.getInstance(project).getClassesByFQN(className);
+            Collection<PhpClass> phpClasses = PhpIndex.getInstance(project).getAnyByFQN(className);
             if (!phpClasses.isEmpty()) {
                 return phpClasses.iterator().next();
             }