Fix isConstantFile and isVarFile checks

waleedyaseen · Aug 28, 2024 · 747e298 · 747e298
1 parent 0e3c905
commit 747e298
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/main/kotlin/io/runescript/plugin/symbollang/psi/RsSymPsiExtensions.kt b/src/main/kotlin/io/runescript/plugin/symbollang/psi/RsSymPsiExtensions.kt
@@ -2,5 +2,14 @@ package io.runescript.plugin.symbollang.psi
 
 import com.intellij.openapi.vfs.VirtualFile
 
-fun VirtualFile.isConstantFile() = name == "constant.sym"
-fun VirtualFile.isVarFile() = name == "varp.sym" || name == "varc.sym"
+fun VirtualFile.isSymbolFileOfTypeLiteral(typeLiteral: String): Boolean {
+    val parent = parent
+    return if (parent != null && parent.name == typeLiteral) true else nameWithoutExtension == typeLiteral
+}
+
+fun VirtualFile.isConstantFile() = isSymbolFileOfTypeLiteral("constant")
+fun VirtualFile.isVarFile() = when {
+    isSymbolFileOfTypeLiteral("varp") -> true
+    isSymbolFileOfTypeLiteral("varc") -> true
+    else -> false
+}
diff --git a/src/main/kotlin/io/runescript/plugin/symbollang/psi/index/RsSymbolIndex.kt b/src/main/kotlin/io/runescript/plugin/symbollang/psi/index/RsSymbolIndex.kt
@@ -8,6 +8,7 @@ import com.intellij.psi.stubs.StubIndex
 import com.intellij.psi.stubs.StubIndexKey
 import io.runescript.plugin.lang.psi.type.RsPrimitiveType
 import io.runescript.plugin.symbollang.psi.RsSymSymbol
+import io.runescript.plugin.symbollang.psi.isSymbolFileOfTypeLiteral
 import io.runescript.plugin.symbollang.psi.stub.types.RsSymFileStubType
 
 
@@ -25,14 +26,7 @@ class RsSymbolIndex : StringStubIndexExtension<RsSymSymbol>() {
             val scope = GlobalSearchScope.allScope(project)
             val configs = StubIndex.getElements(KEY, name, project, scope, RsSymSymbol::class.java)
             return configs.singleOrNull {
-                // TODO: Only include if the file is within the symbols directory.
-                val containingFile = it.containingFile
-                val parent = containingFile.parent
-                if (parent != null && parent.name == lookupType.literal) {
-                    true
-                } else {
-                    containingFile.nameWithoutExtension == lookupType.literal
-                }
+                it.containingFile.virtualFile.isSymbolFileOfTypeLiteral(lookupType.literal)
             }
         }
 

diff --git a/src/main/kotlin/io/runescript/plugin/symbollang/psi/stub/types/RsSymFileStubType.kt b/src/main/kotlin/io/runescript/plugin/symbollang/psi/stub/types/RsSymFileStubType.kt
@@ -9,7 +9,7 @@ import io.runescript.plugin.symbollang.psi.stub.RsSymFileStub
 
 object RsSymFileStubType : IStubFileElementType<RsSymFileStub>(RuneScriptSymbol) {
 
-    override fun getStubVersion() = 0
+    override fun getStubVersion() = 1
 
     override fun serialize(stub: RsSymFileStub, dataStream: StubOutputStream) {