fix ConcurrentModificationException signature filter #66 and migrate to PhpTypeProvider3 #58

Author: Haehnchen

META-INF/plugin.xml

@@ -94,8 +94,10 @@
    TODO: Add provider
   <depends optional="true">de.espend.idea.php.annotation</depends>
   -->
-    <extensions defaultExtensionNs="com.intellij">
-    </extensions>
+
+  <extensions defaultExtensionNs="com.jetbrains.php">
+    <typeProvider3 implementation="de.espend.idea.php.toolbox.type.PhpToolboxTypeProvider"/>
+  </extensions>
 
   <extensions defaultExtensionNs="com.intellij">
 
@@ -104,7 +106,6 @@
                              groupId="language"
                              id="PhpToolbox.ApplicationForm"/>
 
-    <php.typeProvider2 implementation="de.espend.idea.php.toolbox.type.PhpToolboxTypeProvider"/>
     <gotoDeclarationHandler implementation="de.espend.idea.php.toolbox.navigation.PhpToolboxGotoDeclarationHandler"/>
     <completion.contributor language="any" implementationClass="de.espend.idea.php.toolbox.completion.ToolboxCompletionContributor"/>
     <completion.contributor language="JSON" implementationClass="de.espend.idea.php.toolbox.completion.ToolboxJsonCompletionContributor"/>

src/de/espend/idea/php/toolbox/type/PhpToolboxTypeProvider.java

@@ -1,22 +1,22 @@
 package de.espend.idea.php.toolbox.type;
 
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.containers.ContainerUtil;
 import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.psi.elements.*;
-import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider2;
+import com.jetbrains.php.lang.psi.resolve.types.PhpType;
+import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider3;
 import de.espend.idea.php.toolbox.PhpToolboxApplicationService;
 import de.espend.idea.php.toolbox.dict.json.JsonRawLookupElement;
 import de.espend.idea.php.toolbox.dict.json.JsonRegistrar;
 import de.espend.idea.php.toolbox.dict.json.JsonSignature;
 import de.espend.idea.php.toolbox.extension.PhpToolboxProviderInterface;
 import de.espend.idea.php.toolbox.matcher.php.container.ContainerConditions;
+import de.espend.idea.php.toolbox.symfony.Symfony2InterfacesUtil;
 import de.espend.idea.php.toolbox.type.utils.PhpTypeProviderUtil;
 import de.espend.idea.php.toolbox.utils.ExtensionProviderUtil;
-import de.espend.idea.php.toolbox.symfony.Symfony2InterfacesUtil;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -26,7 +26,7 @@
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
-public class PhpToolboxTypeProvider implements PhpTypeProvider2 {
+public class PhpToolboxTypeProvider implements PhpTypeProvider3 {
 
     final static char TRIM_KEY = '\u0195';
 
@@ -37,12 +37,7 @@ public char getKey() {
 
     @Nullable
     @Override
-    public String getType(PsiElement e) {
-
-        if (DumbService.getInstance(e.getProject()).isDumb()) {
-            return null;
-        }
-
+    public PhpType getType(PsiElement e) {
         if(!(e instanceof FunctionReference)) {
             return null;
         }
@@ -56,7 +51,7 @@ public String getType(PsiElement e) {
         Set<String> methods = new HashSet<>();
         Set<String> functions = new HashSet<>();
         for (JsonRegistrar type : types) {
-            for (JsonSignature signature: ContainerUtil.filter(type.getSignatures(), ContainerConditions.RETURN_TYPE_TYPE)) {
+            for (JsonSignature signature: ContainerUtil.filter(new ArrayList<>(type.getSignatures()), ContainerConditions.RETURN_TYPE_TYPE)) {
                 if(signature.getFunction() != null && StringUtils.isNotBlank(signature.getFunction())) {
                     functions.add(signature.getFunction());
                 }
@@ -71,22 +66,28 @@ public String getType(PsiElement e) {
         // Foo::app('bar')
         if(e instanceof MethodReference) {
             if(methods.contains(((FunctionReference) e).getName())) {
-                return PhpTypeProviderUtil.getReferenceSignature((FunctionReference) e, TRIM_KEY);
+                String referenceSignature =  PhpTypeProviderUtil.getReferenceSignature((FunctionReference) e, TRIM_KEY);
+                if(referenceSignature != null) {
+                    return new PhpType().add("#" + this.getKey() + referenceSignature);
+                }
             }
 
             return null;
         }
 
         // foo('bar')
         if(functions.contains(((FunctionReference) e).getName())) {
-            return PhpTypeProviderUtil.getReferenceSignature((FunctionReference) e, TRIM_KEY);
+            String referenceSignature = PhpTypeProviderUtil.getReferenceSignature((FunctionReference) e, TRIM_KEY);
+            if(referenceSignature != null) {
+                return new PhpType().add("#" + this.getKey() + referenceSignature);
+            }
         }
 
         return null;
     }
 
     @Override
-    public Collection<? extends PhpNamedElement> getBySignature(String expression, Project project) {
+    public Collection<? extends PhpNamedElement> getBySignature(String expression, Set<String> visited, int depth, Project project) {
 
         // get back our original call
         // since phpstorm 7.1.2 we need to validate this