Migrate PathResourceGotoDeclarationHandler to use the index

Author: cedricziel

src/main/java/com/cedricziel/idea/typo3/codeInsight/navigation/PathResourceGotoDeclarationHandler.java

@@ -1,18 +1,13 @@
 package com.cedricziel.idea.typo3.codeInsight.navigation;
 
+import com.cedricziel.idea.typo3.index.ResourcePathIndex;
 import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.search.FilenameIndex;
-import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.List;
-
 import static com.cedricziel.idea.typo3.util.ResourceUtil.isExtResourcePath;
 
 public class PathResourceGotoDeclarationHandler implements GotoDeclarationHandler {
@@ -24,26 +19,8 @@ public PsiElement[] getGotoDeclarationTargets(@Nullable PsiElement sourceElement
         }
 
         if (sourceElement != null) {
-            String text = sourceElement.getText();
-            String[] strings = text.split("/");
-            if (strings.length == 0) {
-                return emptyPsiElementArray();
-            }
-
-            String fileName = strings[strings.length - 1];
-            String relativePath = text.replaceFirst("EXT:", "");
-
-            List<PsiFile> psiFiles = Arrays.asList(
-                    FilenameIndex.getFilesByName(
-                            sourceElement.getProject(),
-                            fileName,
-                            GlobalSearchScope.allScope(sourceElement.getProject())
-                    ));
-
-            return psiFiles
-                    .stream()
-                    .filter(x -> x.getVirtualFile().getPath().contains(relativePath))
-                    .toArray(PsiElement[]::new);
+            String identifier = sourceElement.getText();
+            return ResourcePathIndex.findElementsForKey(sourceElement.getProject(), identifier);
         }
 
         return emptyPsiElementArray();

src/main/java/com/cedricziel/idea/typo3/index/ResourcePathIndex.java

@@ -1,19 +1,50 @@
 package com.cedricziel.idea.typo3.index;
 
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiManager;
+import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.indexing.*;
 import com.intellij.util.io.EnumeratorStringDescriptor;
 import com.intellij.util.io.KeyDescriptor;
 import gnu.trove.THashMap;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
-import java.util.Map;
+import java.util.*;
 
 public class ResourcePathIndex extends ScalarIndexExtension<String> {
 
     public static final ID<String, Void> KEY = ID.create("com.cedricziel.idea.typo3.index.resource_path");
 
+    public static Collection<String> getAvailableExtensionResourceFiles(@NotNull Project project) {
+        return FileBasedIndex.getInstance().getAllKeys(ResourcePathIndex.KEY, project);
+    }
+
+    public static boolean projectContainsResourceFile(@NotNull Project project, @NotNull String resourceId) {
+        return FileBasedIndex.getInstance().getAllKeys(ResourcePathIndex.KEY, project).contains(resourceId);
+    }
+
+    public static boolean projectContainsResourceDirectory(@NotNull Project project, @NotNull String resourceId) {
+        return false;
+    }
+
+    public static PsiElement[] findElementsForKey(@NotNull Project project, @NotNull String identifier) {
+        Set<String> keys = new HashSet<>();
+        keys.add(identifier);
+        Set<PsiElement> elements = new HashSet<>();
+
+        FileBasedIndex.getInstance().getFilesWithKey(ResourcePathIndex.KEY, keys, virtualFile -> {
+            elements.add(PsiManager.getInstance(project).findFile(virtualFile));
+
+            return true;
+        }, GlobalSearchScope.allScope(project));
+
+        return elements
+                .stream()
+                .filter(Objects::nonNull)
+                .toArray(PsiElement[]::new);
+    }
+
     @NotNull
     @Override
     public ID<String, Void> getName() {
@@ -59,23 +90,11 @@ public int getVersion() {
     @NotNull
     @Override
     public FileBasedIndex.InputFilter getInputFilter() {
-        return file -> file.isInLocalFileSystem() && (file.getPath().contains("sysext") ||file.getPath().contains("typo3conf/ext"));
+        return file -> file.isInLocalFileSystem() && (file.getPath().contains("sysext") || file.getPath().contains("typo3conf/ext"));
     }
 
     @Override
     public boolean dependsOnFileContent() {
         return false;
     }
-
-    public static Collection<String> getAvailableExtensionResourceFiles(@NotNull Project project) {
-        return FileBasedIndex.getInstance().getAllKeys(ResourcePathIndex.KEY, project);
-    }
-
-    public static boolean projectContainsResourceFile(@NotNull Project project, @NotNull String resourceId) {
-        return FileBasedIndex.getInstance().getAllKeys(ResourcePathIndex.KEY, project).contains(resourceId);
-    }
-
-    public static boolean projectContainsResourceDirectory(@NotNull Project project, @NotNull String resourceId) {
-        return false;
-    }
 }