Merge pull request #1912 from Haehnchen/feature/template-string

replace direct method name for template recognition with a simple "contains" pattern. valid: "template" and "render"

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/PluginConfigurationExtensionParameter.java

@@ -24,6 +24,7 @@ public Project getProject() {
         return project;
     }
 
+    @Deprecated
     public void addTemplateUsageMethod(@NotNull String methodName) {
         templateUsageMethod.add(methodName);
     }

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

@@ -32,12 +32,6 @@
  * @author Daniel Espendiller <[email protected]>
  */
 public class PhpMethodVariableResolveUtil {
-    private static Set<String> RENDER_METHODS = new HashSet<String>() {{
-        add("render");
-        add("renderView");
-        add("renderResponse");
-    }};
-
     /**
      * search for twig template variable on common use cases
      *
@@ -272,7 +266,7 @@ private static class TemplateRenderPsiRecursiveElementWalkingVisitor extends Psi
         }
 
         @Override
-        public void visitElement(PsiElement element) {
+        public void visitElement(@NotNull PsiElement element) {
             if(element instanceof MethodReference) {
                 visitMethodReference((MethodReference) element);
             } else if(element instanceof PhpDocTag) {
@@ -283,11 +277,13 @@ public void visitElement(PsiElement element) {
 
         private void visitMethodReference(@NotNull MethodReference methodReference) {
             String methodName = methodReference.getName();
+            if (methodName == null) {
+                return;
+            }
 
             // init methods once per file
             if(methods == null) {
                 methods = new HashSet<>();
-                methods.addAll(RENDER_METHODS);
 
                 PluginConfigurationExtension[] extensions = Symfony2ProjectComponent.PLUGIN_CONFIGURATION_EXTENSION.getExtensions();
                 if(extensions.length > 0) {
@@ -300,7 +296,7 @@ private void visitMethodReference(@NotNull MethodReference methodReference) {
                 }
             }
 
-            if(!methods.contains(methodName)) {
+            if(!methods.contains(methodName) && !methodName.toLowerCase().contains("template") && !methodName.toLowerCase().contains("render")) {
                 return;
             }