Merge pull request #1775 from Haehnchen/feature/twig-class

support class constants for Twig extension navigation

Author: Haehnchen

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

@@ -149,6 +149,7 @@ private static void parseFunctions(@NotNull Method method, @NotNull Map<String,
      */
     @Nullable
     private static String getCallableSignature(PsiElement psiElement, Method method) {
+        // @TODO can be replaced by PhpStorm function now; much smarter
         // array($this, 'getUrl')
         if(psiElement instanceof ArrayCreationExpression) {
             List<PsiElement> arrayValues = (List<PsiElement>) PsiElementUtils.getChildrenOfTypeAsList(psiElement, PlatformPatterns.psiElement(PhpElementTypes.ARRAY_VALUE));
@@ -162,6 +163,17 @@ private static String getCallableSignature(PsiElement psiElement, Method method)
                             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)) {
+                            PhpClass phpClass = method.getContainingClass();
+                            if(phpClass != null) {
+                                return String.format("#M#C\\%s.%s", classConstantPhpFqn, methodName);
+                            }
+                        }
+                    }
                 }
             }
         } else {

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

@@ -53,6 +53,11 @@ public void testExtensionAreCollected() {
             "OPERATOR",
             TwigExtensionParser.getOperators(getProject()).get("or").getType()
         );
+
+        assertEquals(
+            "#M#C\\ClassInstance.getFoobar",
+            TwigExtensionParser.getFunctions(getProject()).get("class_instance_foobar").getSignature()
+        );
     }
 
     public void testExtensionAreCollectedForDeprecated() {

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

@@ -5,6 +5,10 @@
     function foo_test() {}
     class My_Node_Test {}
 
+    class ClassInstance {
+        public function getFoobar() {}
+    }
+
     interface Twig_ExtensionInterface
     {
         public function getTokenParsers();
@@ -104,6 +108,7 @@ public function getFunctions()
                 'hwi_oauth_login_url'  => new \Twig_Function_Method($this, 'foobar'),
                 new \Twig_Function('max_2', 'max'),
                 new TwigFunction('max_3', 'max'),
+                new TwigFunction('class_instance_foobar', [\ClassInstance::class, 'getFoobar']),
             ];
         }