Add clientscript/command triggers to class contributor

waleedyaseen · Aug 28, 2024 · f68da3c · f68da3c
1 parent f0ee203
commit f68da3c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - Updated to IntelliJ 2024.2.
 - Allowed empty lines in sym files.
 - Symbols can now be resolved from sub directories.
+- Allow for clientscript/command to be looked up in "Search Everywhere".
 
 ## [1.5.1] - 2024-04-15
 

diff --git a/src/main/kotlin/io/runescript/plugin/ide/RsGotoClassContributor.kt b/src/main/kotlin/io/runescript/plugin/ide/RsGotoClassContributor.kt
@@ -11,29 +11,46 @@ import com.intellij.util.indexing.IdFilter
 import io.runescript.plugin.lang.RuneScript
 import io.runescript.plugin.lang.psi.RsScript
 import io.runescript.plugin.lang.psi.qualifiedName
+import io.runescript.plugin.lang.stubs.index.RsClientScriptIndex
+import io.runescript.plugin.lang.stubs.index.RsCommandScriptIndex
 import io.runescript.plugin.lang.stubs.index.RsProcScriptIndex
 
 class RsGotoClassContributor : ChooseByNameContributorEx, GotoClassContributor {
+
+    private val keys = arrayOf(
+        RsProcScriptIndex.KEY,
+        RsClientScriptIndex.KEY,
+        RsCommandScriptIndex.KEY
+    )
+
     override fun processNames(processor: Processor<in String>, scope: GlobalSearchScope, filter: IdFilter?) {
-        StubIndex.getInstance().processAllKeys(
-                RsProcScriptIndex.KEY,
+        for (key in keys) {
+            StubIndex.getInstance().processAllKeys(
+                key,
                 processor,
                 scope,
                 null
-        )
+            )
+        }
     }
 
-    override fun processElementsWithName(name: String, processor: Processor<in NavigationItem>, parameters: FindSymbolParameters) {
+    override fun processElementsWithName(
+        name: String,
+        processor: Processor<in NavigationItem>,
+        parameters: FindSymbolParameters
+    ) {
         val originScope = parameters.searchScope
-        StubIndex.getInstance().processElements(
-                RsProcScriptIndex.KEY,
+        for (key in keys) {
+            StubIndex.getInstance().processElements(
+                key,
                 name,
                 parameters.project,
                 originScope,
                 null,
                 RsScript::class.java
-        ) { element ->
-            processor.process(element)
+            ) { element ->
+                processor.process(element)
+            }
         }
     }