fix "Cannot resolve symbol" for factory service regression #791

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/completion/xml/XmlGotoCompletionRegistrar.java

@@ -5,24 +5,34 @@
 import com.intellij.patterns.XmlPatterns;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlToken;
+import com.intellij.util.containers.ContainerUtil;
+import com.jetbrains.php.completion.PhpLookupElement;
+import com.jetbrains.php.lang.psi.elements.Method;
+import com.jetbrains.php.lang.psi.elements.PhpClass;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
+import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.codeInsight.GotoCompletionProvider;
 import fr.adrienbrault.idea.symfony2plugin.codeInsight.GotoCompletionRegistrar;
 import fr.adrienbrault.idea.symfony2plugin.codeInsight.GotoCompletionRegistrarParameter;
 import fr.adrienbrault.idea.symfony2plugin.codeInsight.utils.GotoCompletionUtil;
 import fr.adrienbrault.idea.symfony2plugin.config.xml.XmlHelper;
+import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.ServiceUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.resource.FileResourceUtil;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.stream.Collectors;
 
 public class XmlGotoCompletionRegistrar implements GotoCompletionRegistrar  {
 
@@ -39,6 +49,15 @@ public void register(GotoCompletionRegistrarParameter registrar) {
             XmlPatterns.psiElement().withParent(XmlHelper.getServiceIdNamePattern()),
             ServiceIdCompletionProvider::new
         );
+
+        // <factory class="AppBundle\Trivago\ConfigFactory" method="create"/>
+        // <factory service="foo" method="create"/>
+        registrar.register(
+            XmlPatterns.psiElement().withParent(XmlHelper.getTagAttributePattern("factory", "method")
+                .inside(XmlHelper.getInsideTagPattern("services"))
+                .inFile(XmlHelper.getXmlFilePattern())),
+            ServiceFactoryMethodCompletionProvider::new
+        );
     }
 
     private static class ImportResourceGotoCompletionProvider extends GotoCompletionProvider {
@@ -114,4 +133,41 @@ public Collection<PsiElement> getPsiTargets(PsiElement element) {
             return Collections.emptyList();
         }
     }
+
+    private static class ServiceFactoryMethodCompletionProvider extends GotoCompletionProvider {
+        ServiceFactoryMethodCompletionProvider(PsiElement element) {
+            super(element);
+        }
+
+        @NotNull
+        @Override
+        public Collection<LookupElement> getLookupElements() {
+            PsiElement parent = getElement().getParent();
+            if(!(parent instanceof XmlAttributeValue)) {
+                return Collections.emptyList();
+            }
+
+            Collection<PhpClass> phpClasses = new ArrayList<>();
+
+            ContainerUtil.addIfNotNull(phpClasses, XmlHelper.getPhpClassForClassFactory((XmlAttributeValue) parent));
+            ContainerUtil.addIfNotNull(phpClasses, XmlHelper.getPhpClassForServiceFactory((XmlAttributeValue) parent));
+
+            Collection<LookupElement> lookupElements = new ArrayList<>();
+
+            for (PhpClass phpClass : phpClasses) {
+                lookupElements.addAll(PhpElementsUtil.getClassPublicMethod(phpClass).stream()
+                    .map(PhpLookupElement::new)
+                    .collect(Collectors.toList())
+                );
+            }
+
+            return lookupElements;
+        }
+
+        @NotNull
+        @Override
+        public Collection<PsiElement> getPsiTargets(PsiElement element) {
+            return Collections.emptyList();
+        }
+    }
 }

src/fr/adrienbrault/idea/symfony2plugin/config/ClassPublicMethodReference.java

@@ -22,22 +22,15 @@ public class ClassPublicMethodReference extends PsiPolyVariantReferenceBase<PsiE
     private String className;
     private String method;
 
-    public ClassPublicMethodReference(@NotNull PsiElement element, String className) {
+    public ClassPublicMethodReference(@NotNull PsiElement element, @NotNull String className) {
         super(element);
         this.className = className;
         this.method = PsiElementUtils.trimQuote(element.getText());
     }
 
-    public ClassPublicMethodReference(@NotNull StringLiteralExpression element, String className) {
-        super(element);
-        this.className = className;
-        this.method = element.getContents();
-    }
-
     @NotNull
     @Override
     public ResolveResult[] multiResolve(boolean incompleteCode) {
-
         PhpClass phpClass = ServiceUtil.getResolvedClassDefinition(getElement().getProject(), this.className);
         if(phpClass == null) {
             return new ResolveResult[0];
@@ -48,10 +41,7 @@ public ResolveResult[] multiResolve(boolean incompleteCode) {
             return new ResolveResult[0];
         }
 
-        return new ResolveResult[] {
-          new PsiElementResolveResult(targetMethod)
-        };
-
+        return PsiElementResolveResult.createResults(targetMethod);
     }
 
     @NotNull

src/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlHelper.java

@@ -6,7 +6,11 @@
 import com.intellij.psi.impl.source.xml.XmlDocumentImpl;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.*;
+import com.jetbrains.php.lang.psi.elements.PhpClass;
+import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
+import fr.adrienbrault.idea.symfony2plugin.util.dict.ServiceUtil;
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
@@ -426,4 +430,44 @@ public static String getServiceDefinitionClass(PsiElement psiInsideService) {
         return null;
     }
 
+
+    @Nullable
+    public static PhpClass getPhpClassForClassFactory(@NotNull XmlAttributeValue xmlAttributeValue) {
+        String method = xmlAttributeValue.getValue();
+        if(StringUtils.isBlank(method)) {
+            return null;
+        }
+
+        XmlTag parentOfType = PsiTreeUtil.getParentOfType(xmlAttributeValue, XmlTag.class);
+        if(parentOfType == null) {
+            return null;
+        }
+
+        String aClass = parentOfType.getAttributeValue("class");
+        if(aClass == null || StringUtils.isBlank(aClass)) {
+            return null;
+        }
+
+        return PhpElementsUtil.getClass(xmlAttributeValue.getProject(), aClass);
+    }
+
+    @Nullable
+    public static PhpClass getPhpClassForServiceFactory(@NotNull XmlAttributeValue xmlAttributeValue) {
+        String method = xmlAttributeValue.getValue();
+        if(StringUtils.isBlank(method)) {
+            return null;
+        }
+
+        XmlTag callXmlTag = PsiTreeUtil.getParentOfType(xmlAttributeValue, XmlTag.class);
+        if(callXmlTag == null) {
+            return null;
+        }
+
+        String service = callXmlTag.getAttributeValue("service");
+        if(StringUtils.isBlank(service)) {
+            return null;
+        }
+
+        return ServiceUtil.getResolvedClassDefinition(xmlAttributeValue.getProject(), service);
+    }
 }