#2017 fix [Twig] Go to function definition does not work when using the first-class callable syntax

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java

@@ -1,7 +1,6 @@
 package fr.adrienbrault.idea.symfony2plugin.templating.util;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Key;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.PsiElement;
@@ -153,29 +152,45 @@ private static String getCallableSignature(PsiElement psiElement, Method method)
         // array($this, 'getUrl')
         if(psiElement instanceof ArrayCreationExpression) {
             List<PsiElement> arrayValues = (List<PsiElement>) PsiElementUtils.getChildrenOfTypeAsList(psiElement, PlatformPatterns.psiElement(PhpElementTypes.ARRAY_VALUE));
-            if(arrayValues.size() > 1) {
+            if (arrayValues.size() > 1) {
                 PsiElement firstChild = arrayValues.get(0).getFirstChild();
-                if(firstChild instanceof Variable && "this".equals(((Variable) firstChild).getName())) {
+                if (firstChild instanceof Variable && "this".equals(((Variable) firstChild).getName())) {
                     String methodName = PhpElementsUtil.getStringValue(arrayValues.get(1).getFirstChild());
-                    if(StringUtils.isNotBlank(methodName)) {
+                    if (StringUtils.isNotBlank(methodName)) {
                         PhpClass phpClass = method.getContainingClass();
-                        if(phpClass != null) {
+                        if (phpClass != null) {
                             return String.format("#M#C\\%s.%s", phpClass.getPresentableFQN(), methodName);
                         }
                     }
                 } else if (firstChild instanceof ClassConstantReference) {
                     String classConstantPhpFqn = PhpElementsUtil.getClassConstantPhpFqn((ClassConstantReference) firstChild);
                     if (StringUtils.isNotEmpty(classConstantPhpFqn)) {
                         String methodName = PhpElementsUtil.getStringValue(arrayValues.get(1).getFirstChild());
-                        if(StringUtils.isNotBlank(methodName)) {
+                        if (StringUtils.isNotBlank(methodName)) {
                             PhpClass phpClass = method.getContainingClass();
-                            if(phpClass != null) {
+                            if (phpClass != null) {
                                 return String.format("#M#C\\%s.%s", classConstantPhpFqn, methodName);
                             }
                         }
                     }
                 }
             }
+        } else if(psiElement instanceof PhpCallableMethod) {
+            // we need to resolve the type, no api support
+            // $this->foobar(...)
+            PsiElement firstChild = ((PhpCallableMethod) psiElement).getFirstPsiChild();
+            if (firstChild instanceof Variable && "this".equals(((Variable) firstChild).getName())) {
+                PhpClass phpClass = method.getContainingClass();
+                if (phpClass != null) {
+                    return String.format("#M#C\\%s.%s", phpClass.getPresentableFQN(), ((PhpCallableMethod) psiElement).getName());
+                }
+            }
+        } else if(psiElement instanceof PhpCallableFunction) {
+            // foobar(...)
+            String name = ((PhpCallableFunction) psiElement).getName();
+            if (StringUtils.isNotBlank(name)) {
+                return "#F" + name;
+            }
         } else {
             String funcTargetName = PhpElementsUtil.getStringValue(psiElement);
             if(funcTargetName != null) {
@@ -470,7 +485,7 @@ private void visitNewExpression(@NotNull NewExpression element) {
                         }
 
                         // creation options like: needs_environment
-                        Map<String, String> options;
+                        Map<String, String> options = new HashMap<>();
                         if(psiElement.length > 2 && psiElement[2] instanceof ArrayCreationExpression) {
                             options = getOptions((ArrayCreationExpression) psiElement[2]);
                         } else {

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigExtensionParserTest.java

@@ -58,6 +58,16 @@ public void testExtensionAreCollected() {
             "#M#C\\ClassInstance.getFoobar",
             TwigExtensionParser.getFunctions(getProject()).get("class_instance_foobar").getSignature()
         );
+
+        assertEquals(
+            "#M#C\\Twig\\Extensions.getFoobar",
+            TwigExtensionParser.getFunctions(getProject()).get("class_php_callable_method_foobar").getSignature()
+        );
+
+        assertEquals(
+            "#Fmax",
+            TwigExtensionParser.getFunctions(getProject()).get("class_php_callable_function_foobar").getSignature()
+        );
     }
 
     public void testExtensionAreCollectedForDeprecated() {

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/twig_extensions.php

@@ -109,6 +109,8 @@ public function getFunctions()
                 new \Twig_Function('max_2', 'max'),
                 new TwigFunction('max_3', 'max'),
                 new TwigFunction('class_instance_foobar', [\ClassInstance::class, 'getFoobar']),
+                new TwigFunction('class_php_callable_method_foobar', $this->getFoobar(...)),
+                new TwigFunction('class_php_callable_function_foobar', max(...)),
             ];
         }