add controller resolve for indexed twig render calls

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/PhpTwigTemplateUsageStubIndex.java

@@ -17,12 +17,21 @@
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 public class PhpTwigTemplateUsageStubIndex extends FileBasedIndexExtension<String, Void> {
 
  public static final ID<String, Void> KEY = ID.create("fr.adrienbrault.idea.symfony2plugin.twig_php_usage");
  private final KeyDescriptor<String> myKeyDescriptor = new EnumeratorStringDescriptor();
+ private static int MAX_FILE_BYTE_SIZE = 2097152;
+
+ public static Set<String> RENDER_METHODS = new HashSet<String>() {{
+ add("render");
+ add("renderView");
+ add("renderResponse");
+ }};
 
  @NotNull
  @Override
@@ -44,7 +53,7 @@ public Map<String, Void> map(FileContent inputData) {
  return map;
  }
 
- if(!(inputData.getPsiFile() instanceof PhpFile)) {
+ if(!(inputData.getPsiFile() instanceof PhpFile) && isValidForIndex(inputData)) {
  return map;
  }
 
@@ -59,7 +68,7 @@ public void visitElement(PsiElement element) {
 
  public void visitMethodReference(MethodReference methodReference) {
  String methodName = methodReference.getName();
- if(!"render".equals(methodName) && !"renderView".equals(methodName) && !"renderResponse".equals(methodName)) {
+ if(!RENDER_METHODS.contains(methodName)) {
  return;
  }
 
@@ -110,6 +119,10 @@ public int getVersion() {
  return 1;
  }
 
+ public static boolean isValidForIndex(FileContent inputData) {
+ return inputData.getFile().getLength() < MAX_FILE_BYTE_SIZE;
+ }
+
 }
 
 

src/fr/adrienbrault/idea/symfony2plugin/templating/TwigControllerLineMarkerProvider.java

@@ -84,13 +84,20 @@ public void collectSlowLineMarkers(@NotNull List<PsiElement> psiElements, @NotNu
 
  private void attachController(TwigFile psiElement, Collection<? super RelatedItemLineMarkerInfo> result) {
 
+ Set<Method> methods = new HashSet<Method>();
  Method method = TwigUtil.findTwigFileController(psiElement);
- if(method == null) {
+ if(method != null) {
+ methods.add(method);
+ }
+
+ methods.addAll(TwigUtil.getTwigFileMethodUsageOnIndex(psiElement));
+
+ if(methods.size() == 0) {
  return;
  }
 
  NavigationGutterIconBuilder<PsiElement> builder = NavigationGutterIconBuilder.create(Symfony2Icons.TWIG_CONTROLLER_LINE_MARKER).
- setTargets(method).
+ setTargets(methods).
  setTooltipText("Navigate to controller");
 
  result.add(builder.createLineMarkerInfo(psiElement));

src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigTypeResolveUtil.java

@@ -215,7 +215,6 @@ public static HashMap<String, PsiVariable> collectScopeVariables(@NotNull PsiEle
  HashMap<String, PsiVariable> controllerVars = new HashMap<String, PsiVariable>();
 
  VirtualFile virtualFile = psiElement.getContainingFile().getVirtualFile();
- System.out.println(virtualFile.toString());
  if(visitedFiles.contains(virtualFile)) {
  return controllerVars;
  }

src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java

@@ -7,21 +7,24 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
+import com.intellij.psi.PsiRecursiveElementWalkingVisitor;
+import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiElementFilter;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.Processor;
+import com.intellij.util.indexing.FileBasedIndexImpl;
 import com.jetbrains.php.PhpIndex;
+import com.jetbrains.php.lang.PhpFileType;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag;
-import com.jetbrains.php.lang.psi.elements.Method;
-import com.jetbrains.php.lang.psi.elements.PhpClass;
-import com.jetbrains.php.lang.psi.elements.PhpPsiElement;
+import com.jetbrains.php.lang.psi.elements.*;
 import com.jetbrains.twig.TwigFile;
 import com.jetbrains.twig.TwigFileType;
 import com.jetbrains.twig.elements.TwigBlockTag;
 import com.jetbrains.twig.elements.TwigElementTypes;
 import com.jetbrains.twig.elements.TwigExtendsTag;
 import fr.adrienbrault.idea.symfony2plugin.TwigHelper;
+import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.PhpTwigTemplateUsageStubIndex;
 import fr.adrienbrault.idea.symfony2plugin.templating.dict.*;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.dict.PsiVariable;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
@@ -347,12 +350,73 @@ public static HashMap<String, PsiVariable> collectControllerTemplateVariables(Ps
  }
 
  Method method = findTwigFileController((TwigFile) psiFile);
- if(method == null) {
- return vars;
+ if(method != null) {
+ return PhpMethodVariableResolveUtil.collectMethodVariables(method);
+ }
+
+ final Set<Method> methods = getTwigFileMethodUsageOnIndex((TwigFile) psiFile);
+
+ HashMap<String, PsiVariable> stringPsiVariableHashMap = new HashMap<String, PsiVariable>();
+ for(Method methodIndex : methods) {
+ stringPsiVariableHashMap.putAll(PhpMethodVariableResolveUtil.collectMethodVariables(methodIndex));
+ }
+
+ return stringPsiVariableHashMap;
+
+ }
+
+ @NotNull
+ public static Set<Method> getTwigFileMethodUsageOnIndex(@NotNull TwigFile psiFile) {
+
+ Map<String, VirtualFile> templateName = TwigUtil.getTemplateName(psiFile);
+ if(templateName.size() == 0) {
+ return Collections.emptySet();
+ }
+
+ final Set<String> keys = templateName.keySet();
+ final Set<VirtualFile> virtualFiles = new HashSet<VirtualFile>();
+
+ // find virtual files
+ for(String key: keys) {
+ FileBasedIndexImpl.getInstance().getFilesWithKey(PhpTwigTemplateUsageStubIndex.KEY, new HashSet<String>(Arrays.asList(key)), new Processor<VirtualFile>() {
+ @Override
+ public boolean process(VirtualFile virtualFile) {
+ virtualFiles.add(virtualFile);
+ return true;
+ }
+ }, GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(psiFile.getProject()), PhpFileType.INSTANCE));
  }
 
- return PhpMethodVariableResolveUtil.collectMethodVariables(method);
+ final Set<Method> methods = new HashSet<Method>();
+
+ for(VirtualFile virtualFile : virtualFiles) {
+
+ PsiFile psiTemplate = PsiManager.getInstance(psiFile.getProject()).findFile(virtualFile);
+ if(psiTemplate == null) {
+ continue;
+ }
+
+ psiTemplate.accept(new PsiRecursiveElementWalkingVisitor() {
+ @Override
+ public void visitElement(PsiElement element) {
+ if(element instanceof StringLiteralExpression && element.getParent() instanceof ParameterList && element.getParent().getParent() instanceof MethodReference && keys.contains(((StringLiteralExpression) element).getContents())) {
+
+ PsiElement methodReference = element.getParent().getParent();
+ if(methodReference instanceof MethodReference && PhpTwigTemplateUsageStubIndex.RENDER_METHODS.contains(((MethodReference) methodReference).getName())) {
+ Method method = PsiTreeUtil.getParentOfType(element, Method.class);
+ if(method != null) {
+ methods.add(method);
+ }
+ }
+ }
+
+ super.visitElement(element);
+ }
+ });
+
+ }
 
+ return methods;
  }
 
  @Nullable