support Twig component template and namespace mapping

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/PhpLineMarkerProvider.java

@@ -57,15 +57,8 @@ private void attachUxComponents(@NotNull Collection<? super LineMarkerInfo<?>> l
         }
 
         if (leaf.getParent() instanceof PhpClass phpClass) {
-            Collection<String> templates = new ArrayList<>();
-
-            UxUtil.visitComponents(phpClass, t -> {
-                templates.add(Objects.requireNonNullElseGet(t.template(), () -> "components/" + t.name() + ".html.twig"));
-            });
-
             Collection<PsiFile> files = new HashSet<>();
-
-            for (String template : templates) {
+            for (String template : UxUtil.getComponentTemplatesForPhpClass(phpClass)) {
                 files.addAll(TwigUtil.getTemplatePsiElements(phpClass.getProject(), template));
             }
 

src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/UxComponent.java

@@ -10,7 +10,7 @@
 /**
  * @author Daniel Espendiller <[email protected]>
  */
-public record UxComponent(@NotNull String name, @NotNull String phpClass, @Nullable String template, fr.adrienbrault.idea.symfony2plugin.util.UxUtil.TwigComponentType type) implements Serializable {
+public record UxComponent(@Nullable String name, @NotNull String phpClass, @Nullable String template, @NotNull fr.adrienbrault.idea.symfony2plugin.util.UxUtil.TwigComponentType type) implements Serializable {
     @Override
     public int hashCode() {
         return new HashCodeBuilder()

src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/UxTemplateStubIndex.java

@@ -33,7 +33,7 @@ public class UxTemplateStubIndex extends FileBasedIndexExtension<String, UxCompo
             Map<String, UxComponent> map = new HashMap<>();
 
             if(inputData.getPsiFile() instanceof PhpFile phpFile) {
-                UxUtil.visitComponents(phpFile, t -> map.put(t.name(), new UxComponent(t.name(), t.phpClass().getFQN(), t.template(), t.type())));
+                UxUtil.visitComponentsForIndex(phpFile, t -> map.put(t.phpClass().getFQN(), new UxComponent(t.name(), t.phpClass().getFQN(), t.template(), t.type())));
             }
 
             return map;
@@ -52,7 +52,7 @@ public class UxTemplateStubIndex extends FileBasedIndexExtension<String, UxCompo
 
     @Override
     public int getVersion() {
-        return 2;
+        return 3;
     }
 
     public FileBasedIndex.@NotNull InputFilter getInputFilter() {

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/HtmlTemplateGoToDeclarationHandler.java

@@ -1,7 +1,6 @@
 package fr.adrienbrault.idea.symfony2plugin.templating;
 
 import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler;
-import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
@@ -10,20 +9,16 @@
 import com.intellij.psi.xml.XmlElementType;
 import com.intellij.psi.xml.XmlToken;
 import com.intellij.psi.xml.XmlTokenType;
-import com.jetbrains.php.lang.psi.elements.Field;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
-import com.jetbrains.php.lang.psi.elements.PhpNamedElement;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.routing.Route;
 import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigHtmlCompletionUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.UxUtil;
-import kotlin.Pair;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.function.Consumer;
 
 /**
  * @author Daniel Espendiller <[email protected]>
@@ -72,7 +67,8 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int offset,
 
                     String componentName = StringUtils.stripStart(text, "twig:");
                     if (!componentName.isBlank()) {
-                        targets.addAll(UxUtil.getTwigComponentNameTargets(project, componentName));
+                        targets.addAll(UxUtil.getTwigComponentPhpClasses(project, componentName));
+                        targets.addAll(UxUtil.getComponentTemplates(project, componentName));
                     }
                 }
             } else {
@@ -89,7 +85,7 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int offset,
                     String text = psiElement.getText();
                     Project project = psiElement.getProject();
 
-                    for (PhpClass phpClass : UxUtil.getTwigComponentNameTargets(project, htmlTag.getName().substring(5))) {
+                    for (PhpClass phpClass : UxUtil.getTwigComponentPhpClasses(project, htmlTag.getName().substring(5))) {
                         UxUtil.visitComponentVariables(phpClass, pair -> {
                             if (pair.getFirst().equals(StringUtils.stripStart(text, ":"))) {
                                 targets.add(pair.getSecond());

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java

@@ -3,6 +3,7 @@
 import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.patterns.PlatformPatterns;
@@ -313,12 +314,15 @@ private Collection<PsiElement> getRouteGoTo(@NotNull PsiElement psiElement) {
 
     private Collection<? extends PsiElement> getComponentGoTo(@NotNull PsiElement psiElement) {
         String text = PsiElementUtils.getText(psiElement);
-
-        if(StringUtils.isBlank(text)) {
+        if (StringUtils.isBlank(text)) {
             return Collections.emptyList();
         }
 
-        return UxUtil.getTwigComponentNameTargets(psiElement.getProject(), text);
+        Project project = psiElement.getProject();
+        return new ArrayList<>() {{
+            addAll(UxUtil.getComponentTemplates(project, text));
+            addAll(UxUtil.getTwigComponentPhpClasses(project, text));
+        }};
     }
 
     @NotNull

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigHtmlCompletionContributor.java

@@ -183,7 +183,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull
                         return;
                     }
 
-                    for (PhpClass phpClass : UxUtil.getTwigComponentNameTargets(position.getProject(), parentOfType.getName().substring(5))) {
+                    for (PhpClass phpClass : UxUtil.getTwigComponentPhpClasses(position.getProject(), parentOfType.getName().substring(5))) {
                         UxUtil.visitComponentVariables(phpClass, pair -> {
                             PhpNamedElement field = pair.getSecond();