fix template usage extraction issues with inline method reference usi…

…ng wrong type cast #1410
Haehnchen · Jan 2, 2020 · dbe29d4 · dbe29d4
1 parent 2d9e51f
commit dbe29d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/...ava/fr/adrienbrault/idea/symfony2plugin/templating/util/PhpMethodVariableResolveUtil.java b/...ava/fr/adrienbrault/idea/symfony2plugin/templating/util/PhpMethodVariableResolveUtil.java
@@ -313,7 +313,7 @@ private void visitMethodReference(@NotNull MethodReference methodReference) {
             }
 
             if (parameters[0] instanceof StringLiteralExpression) {
-                resolveString(methodReference, parameters[0]);
+                addStringLiteralScope(methodReference, (StringLiteralExpression) parameters[0]);
             } else if(parameters[0] instanceof TernaryExpression) {
                 // render(true === true ? 'foo.twig.html' : 'foobar.twig.html')
                 for (PhpPsiElement phpPsiElement : new PhpPsiElement[]{((TernaryExpression) parameters[0]).getTrueVariant(), ((TernaryExpression) parameters[0]).getFalseVariant()}) {
@@ -322,16 +322,16 @@ private void visitMethodReference(@NotNull MethodReference methodReference) {
                     }
 
                     if (phpPsiElement instanceof StringLiteralExpression) {
-                        resolveString(methodReference, phpPsiElement);
+                        addStringLiteralScope(methodReference, (StringLiteralExpression) phpPsiElement);
                     } else if(phpPsiElement instanceof PhpReference) {
                         resolvePhpReference(methodReference, phpPsiElement);
                     }
                 }
             } else if(parameters[0] instanceof AssignmentExpression) {
                 // $this->render($template = 'foo.html.twig')
                 PhpPsiElement value = ((AssignmentExpression) parameters[0]).getValue();
-                if(value != null) {
-                    resolveString(methodReference, value);
+                if(value instanceof StringLiteralExpression) {
+                    addStringLiteralScope(methodReference, (StringLiteralExpression) value);
                 }
             } else if(parameters[0] instanceof PhpReference) {
                 resolvePhpReference(methodReference, parameters[0]);
@@ -340,28 +340,13 @@ private void visitMethodReference(@NotNull MethodReference methodReference) {
                 PsiElement phpPsiElement = ((BinaryExpression) parameters[0]).getRightOperand();
 
                 if (phpPsiElement instanceof StringLiteralExpression) {
-                    resolveString(methodReference, phpPsiElement);
+                    addStringLiteralScope(methodReference, (StringLiteralExpression) phpPsiElement);
                 } else if(phpPsiElement instanceof PhpReference) {
                     resolvePhpReference(methodReference, phpPsiElement);
                 }
             }
         }
 
-        private void resolveString(@NotNull MethodReference methodReference, PsiElement parameter) {
-            // foo('foo.html.twig')
-            String contents = ((StringLiteralExpression) parameter).getContents();
-            if (StringUtils.isBlank(contents) || !contents.endsWith(".twig")) {
-                return;
-            }
-
-            Function parentOfType = PsiTreeUtil.getParentOfType(methodReference, Function.class);
-            if(parentOfType == null) {
-                return;
-            }
-
-            addTemplateWithScope(contents, parentOfType, methodReference);
-        }
-
         private void resolvePhpReference(@NotNull MethodReference methodReference, PsiElement parameter) {
             for (PhpNamedElement phpNamedElement : ((PhpReference) parameter).resolveLocal()) {
                 // foo(self::foo)

diff --git a/...rienbrault/idea/symfony2plugin/tests/stubs/indexes/PhpTwigTemplateUsageStubIndexTest.java b/...rienbrault/idea/symfony2plugin/tests/stubs/indexes/PhpTwigTemplateUsageStubIndexTest.java
@@ -29,6 +29,7 @@ public void testThatTwigRenderMethodsAreInIndex() {
             "       $foo->render('@!Foo/overwrite.html.twig');\n" +
             "       $foo->renderView('foo-renderView.html.twig');\n" +
             "       $foo->renderView($t = 'foo-var-assignment-expression.html.twig');\n" +
+            "       $foo->renderView($t = $foo->foo());\n" +
             "       $foo->renderResponse('foo-renderResponse.html.twig');\n" +
             "       $foo->render(self::FOO);\n" +
             "       $foo->render($var);\n" +