Merge pull request #1691 from Haehnchen/feature/defaults-template

support default function parameter values for extracting template render scope

Author: Haehnchen

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

@@ -353,17 +353,21 @@ private void resolvePhpReference(@NotNull MethodReference methodReference, PsiEl
                     if (defaultValue instanceof StringLiteralExpression) {
                         addStringLiteralScope(methodReference, (StringLiteralExpression) defaultValue);
                     }
-                }
-
-                // foo($var) => $var = 'test.html.twig'
-                if (phpNamedElement instanceof Variable) {
+                } else if (phpNamedElement instanceof Variable) {
+                    // foo($var) => $var = 'test.html.twig'
                     PsiElement assignmentExpression = phpNamedElement.getParent();
                     if (assignmentExpression instanceof AssignmentExpression) {
                         PhpPsiElement value = ((AssignmentExpression) assignmentExpression).getValue();
                         if (value instanceof StringLiteralExpression) {
                             addStringLiteralScope(methodReference, (StringLiteralExpression) value);
                         }
                     }
+                } else if (phpNamedElement instanceof Parameter) {
+                    // function foobar($defaultParameter = 'default-function-parameter.html.twig')
+                    PsiElement value = ((Parameter) phpNamedElement).getDefaultValue();
+                    if (value instanceof StringLiteralExpression) {
+                        addStringLiteralScope(methodReference, (StringLiteralExpression) value);
+                    }
                 }
             }
         }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/PhpTwigTemplateUsageStubIndexTest.java

@@ -18,7 +18,7 @@ public void testThatTwigRenderMethodsAreInIndex() {
             "   const FOO_TERNARY = 'const-ternary.html.twig';\n" +
             "   const FOO_COALESCE = 'const-coalesce.html.twig';\n" +
             "   private $foo = 'private.html.twig';\n" +
-            "   public function foobar() {\n" +
+            "   public function foobar($defaultParameter = 'default-function-parameter.html.twig') {\n" +
             "       $var = 'var.html.twig';\n" +
             "       $foo->render('foo-render.html.twig');\n" +
             "       $foo->render('foo-render.html.twig');\n" +
@@ -35,6 +35,7 @@ public void testThatTwigRenderMethodsAreInIndex() {
             "       $foo->render($var);\n" +
             "       $foo->render($this->foo);\n" +
             "       $foo->render(\\DateTime::foo);\n" +
+            "       $foo->renderView($defaultParameter);\n" +
             "   }\n" +
             "}" +
             "" +
@@ -49,7 +50,7 @@ public void testThatTwigRenderMethodsAreInIndex() {
             "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-var-assignment-expression.html.twig"
+            "foo-var-assignment-expression.html.twig", "default-function-parameter.html.twig"
         );
 
         assertIndexContainsKeyWithValue(PhpTwigTemplateUsageStubIndex.KEY, "foo-render.html.twig", value ->