provide a global class::method[Action] yaml navigation, usable inside drupal

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlGoToDeclarationHandler.java

@@ -6,6 +6,8 @@
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.jetbrains.php.lang.psi.elements.Method;
+import com.jetbrains.php.lang.psi.elements.PhpClass;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.TwigHelper;
 import fr.adrienbrault.idea.symfony2plugin.stubs.ContainerCollectionResolver;
@@ -18,10 +20,7 @@
 import org.jetbrains.yaml.YAMLLanguage;
 import org.jetbrains.yaml.YAMLTokenTypes;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
@@ -61,7 +60,7 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int i, Edit
  }
 
  if(psiText.contains("\\")) {
- psiElements.addAll(Arrays.asList(classGoToDeclaration(psiElement, psiText))) ;
+ psiElements.addAll(classGoToDeclaration(psiElement, psiText)) ;
  }
 
  if(psiText.endsWith(".twig") || psiText.endsWith(".php")) {
@@ -71,8 +70,30 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int i, Edit
  return psiElements.toArray(new PsiElement[psiElements.size()]);
  }
 
- protected PsiElement[] classGoToDeclaration(PsiElement psiElement, String className) {
- return PhpElementsUtil.getClassInterfacePsiElements(psiElement.getProject(), className);
+ protected Collection<PsiElement> classGoToDeclaration(PsiElement psiElement, String className) {
+
+ Collection<PsiElement> psiElements = new HashSet<PsiElement>();
+
+ // Class::method
+ // Class::FooAction
+ // Class:Foo
+ if(className.contains(":")) {
+ String[] split = className.replaceAll("(:)\\1", "$1").split(":");
+ if(split.length == 2) {
+ for(String append: new String[] {"", "Action"}) {
+ Method classMethod = PhpElementsUtil.getClassMethod(psiElement.getProject(), split[0], split[1] + append);
+ if(classMethod != null) {
+ psiElements.add(classMethod);
+ }
+ }
+ }
+
+ return psiElements;
+ }
+
+ // ClassName
+ psiElements.addAll(PhpElementsUtil.getClassesInterface(psiElement.getProject(), className));
+ return psiElements;
  }
 
  protected PsiElement[] serviceGoToDeclaration(PsiElement psiElement, String serviceId) {

src/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java

@@ -136,6 +136,7 @@ static public PsiElement getPsiElementsBySignatureSingle(Project project, @Nulla
  return psiElements[0];
  }
 
+ @Deprecated
  static public PsiElement[] getClassInterfacePsiElements(Project project, String FQNClassOrInterfaceName) {
 
  // convert ResolveResult to PsiElement
@@ -311,6 +312,16 @@ static public PhpClass getClassInterface(Project project, @NotNull String classN
  return phpClasses.size() == 0 ? null : phpClasses.iterator().next();
  }
 
+ static public Collection<PhpClass> getClassesInterface(Project project, @NotNull String className) {
+
+ // api workaround for at least interfaces
+ if(!className.startsWith("\\")) {
+ className = "\\" + className;
+ }
+
+ return PhpIndex.getInstance(project).getAnyByFQN(className);
+ }
+
  static public void addClassPublicMethodCompletion(CompletionResultSet completionResultSet, PhpClass phpClass) {
  for(Method method: getClassPublicMethod(phpClass)) {
  completionResultSet.addElement(new PhpLookupElement(method));