support indexing of template assignment expression for Twig template names

Haehnchen · Haehnchen · commit 63fb7218b23c · 2019-12-03T20:22:01.000+01:00
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/PhpMethodVariableResolveUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/PhpMethodVariableResolveUtil.java
@@ -327,6 +327,12 @@ private void visitMethodReference(@NotNull MethodReference methodReference) {
                         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);
+                }
             } else if(parameters[0] instanceof PhpReference) {
                 resolvePhpReference(methodReference, parameters[0]);
             } else if(parameters[0] instanceof BinaryExpression) {
diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/PhpTwigTemplateUsageStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/PhpTwigTemplateUsageStubIndexTest.java
@@ -28,6 +28,7 @@ public void testThatTwigRenderMethodsAreInIndex() {
             "       $foo->render($foobar ?? self::FOO_COALESCE);\n" +
             "       $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->renderResponse('foo-renderResponse.html.twig');\n" +
             "       $foo->render(self::FOO);\n" +
             "       $foo->render($var);\n" +
@@ -46,7 +47,8 @@ public void testThatTwigRenderMethodsAreInIndex() {
             PhpTwigTemplateUsageStubIndex.KEY,
             "foo-render.html.twig", "foo-renderView.html.twig", "foo-renderResponse.html.twig",
             "@Foo/overwrite.html.twig", "const.html.twig", "var.html.twig", "private.html.twig", "foobar-render.twig",
-            "foo-render-ternary.html.twig", "const-ternary.html.twig", "foo-render-coalesce.html.twig", "const-coalesce.html.twig"
+            "foo-render-ternary.html.twig", "const-ternary.html.twig", "foo-render-coalesce.html.twig", "const-coalesce.html.twig",
+            "foo-var-assignment-expression.html.twig"
         );
 
         assertIndexContainsKeyWithValue(PhpTwigTemplateUsageStubIndex.KEY, "foo-render.html.twig", value ->

Original file line number	Diff line number	Diff line change
`@@ -327,6 +327,12 @@ private void visitMethodReference(@NotNull MethodReference methodReference) {`
`327`	`327`	`resolvePhpReference(methodReference, phpPsiElement);`
`328`	`328`	`}`
`329`	`329`	`}`
	`330`	`+ } else if(parameters[0] instanceof AssignmentExpression) {`
	`331`	`+ // $this->render($template = 'foo.html.twig')`
	`332`	`+ PhpPsiElement value = ((AssignmentExpression) parameters[0]).getValue();`
	`333`	`+ if(value != null) {`
	`334`	`+ resolveString(methodReference, value);`
	`335`	`+ }`
`330`	`336`	`} else if(parameters[0] instanceof PhpReference) {`
`331`	`337`	`resolvePhpReference(methodReference, parameters[0]);`
`332`	`338`	`} else if(parameters[0] instanceof BinaryExpression) {`