Skip to content

ADFA-4059: capture debug info when SourceFileIndexer fails #1335

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

Merged
Daniel-ADFA merged 8 commits into from
May 26, 2026
Merged

ADFA-4059: capture debug info when SourceFileIndexer fails #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d989247
fix: avoid sharing visited set in fast-path and full-scan
itsaky-adfa May 21, 2026
370cb03
fix: guard CompilationEnv.refreshSources with lock to avoid race
itsaky-adfa May 21, 2026
f30fc15
fix: capture failure details when SourceFileIndexer fails
itsaky-adfa May 25, 2026
4059800
Merge branch 'stage' into fix/ADFA-4059
itsaky-adfa May 25, 2026
3bc5255
fix: use attachments to include kt psi exp attachments
itsaky-adfa May 26, 2026
63a633a
fix: specify super for Kt*Module impls explicitly
itsaky-adfa May 26, 2026
cfa9a16
fix: incorrect module description
itsaky-adfa May 26, 2026
24fd0cc
Merge branch 'stage' into fix/ADFA-4059
itsaky-adfa May 26, 2026
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
1 change: 1 addition & 0 deletions lsp/kotlin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ dependencies {
implementation(libs.common.kotlin)
implementation(libs.common.kotlin.coroutines.core)
implementation(libs.common.kotlin.coroutines.android)
implementation(libs.sentry.android.core)

compileOnly(projects.common)

Expand Down
2 changes: 2 additions & 0 deletions lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/KotlinLanguageServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import com.itsaky.androidide.tasks.createJobCancelChecker
import com.itsaky.androidide.utils.DocumentUtils
import com.itsaky.androidide.utils.Environment
import com.itsaky.androidide.utils.ifNotEmpty
import io.sentry.Sentry
import kotlinx.coroutines.CoroutineName
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
Expand Down Expand Up @@ -321,6 +322,7 @@ class KotlinLanguageServer : ILanguageServer {
@Subscribe
@Suppress("unused")
fun onBuildCompleted(event: BuildCompletedEvent) {
Sentry.addBreadcrumb("onBuildCompleted: result=${event.result}")
compiler?.refreshSources()
}

Expand Down
17 changes: 11 additions & 6 deletions lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/compiler/CompilationEnvironment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import com.itsaky.androidide.lsp.kotlin.utils.toVirtualFileOrNull
import com.itsaky.androidide.projects.FileManager
import com.itsaky.androidide.projects.api.Workspace
import com.itsaky.androidide.utils.KeyedDebouncingAction
import io.sentry.Sentry
import kotlinx.coroutines.CoroutineName
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
Expand Down Expand Up @@ -118,7 +119,7 @@ import kotlin.time.Duration.Companion.milliseconds
@Suppress("UnstableApiUsage")
@OptIn(K1Deprecation::class)
internal class CompilationEnvironment(
name: String,
val name: String,
val kind: CompilationKind,
workspace: Workspace,
val ktProject: KotlinProjectModel,
Expand Down Expand Up @@ -408,12 +409,16 @@ internal class CompilationEnvironment(
}

fun refreshSources() {
ResolutionScopeProvider.getInstance(project)
.invalidateAll()
Sentry.addBreadcrumb("refreshSources (env=${name}, modules=${modules.size})")
project.write {
Sentry.addBreadcrumb("refreshSources(env=${name}): in-progress")
ResolutionScopeProvider.getInstance(project)
.invalidateAll()

modules.asFlatSequence()
.filterIsInstance<AbstractKtModule>()
.forEach { it.invalidateSearchScope() }
modules.asFlatSequence()
.filterIsInstance<AbstractKtModule>()
.forEach { it.invalidateSearchScope() }
}

ktSymbolIndex.refreshSources()
// TODO: Should also update/notify Java file services about possibly changed Java files
Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -6,6 +6,7 @@ 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 io.sentry.Sentry
import kotlinx.coroutines.CoroutineName
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
Expand Down Expand Up @@ -117,6 +118,7 @@ internal class KtSymbolIndex(
}

fun refreshSources() {
Sentry.addBreadcrumb("KtSymbolIndex.refreshSources()")
indexingJob ?: startIndexing()

scanningJob?.cancel()
Expand Down
Loading
Loading