Skip to content

ADFA-3944: ensure KtSymbolIndex.getKtFile does not fail for non-Kotlin files #1279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
itsaky-adfa wants to merge 1 commit into
base: stage
Choose a base branch
from
+5 −3
Open

ADFA-3944: ensure KtSymbolIndex.getKtFile does not fail for non-Kotlin files #1279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/compiler/index/KtSymbolIndex.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.itsaky.androidide.lsp.kotlin.compiler.CompilationKind
import com.itsaky.androidide.lsp.kotlin.compiler.modules.KtModule
import com.itsaky.androidide.lsp.kotlin.compiler.read
import com.itsaky.androidide.lsp.kotlin.utils.toVirtualFileOrNull
import com.itsaky.androidide.utils.DocumentUtils
import kotlinx.coroutines.CoroutineName
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
Expand Down Expand Up @@ -172,8 +173,9 @@ internal class KtSymbolIndex(

fun getOpenedKtFile(path: Path) = openedFiles[path]

fun getKtFile(vf: VirtualFile): KtFile {
fun getKtFile(vf: VirtualFile): KtFile? {
val path = vf.toNioPath()
if (!DocumentUtils.isKotlinFile(path)) return null

openedFiles[path]?.also { return it }
ktFileCache.getIfPresent(path)?.also { return it }
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/itsaky/androidide/lsp/kotlin/compiler/services/DeclarationsProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,6 @@ internal class DeclarationProvider(
return index.filesForPackage(fqName.asString())
.mapNotNull { VirtualFileManager.getInstance().findFileByNioPath(Paths.get(it.filePath)) }
.filter { it in scope }
.map { index.getKtFile(it) }
.mapNotNull { index.getKtFile(it) }
}
}
2 changes: 1 addition & 1 deletion .../main/java/com/itsaky/androidide/lsp/kotlin/compiler/services/DirectInheritorsProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ internal class DirectInheritorsProvider: KtLspService, KotlinDirectInheritorsPro
modules
.asFlatSequence()
.filter { it.isSourceModule }.flatMap { it.computeFiles(extended = true) }
.map { index.getKtFile(it) }
.mapNotNull { index.getKtFile(it) }
.forEach { ktFile ->
ktFile.accept(object : KtTreeVisitorVoid() {
override fun visitClassOrObject(classOrObject: KtClassOrObject) {
Expand Down
Loading