Skip to content

Fix PsiEnvironment thread safety in SymbolExtractor #11

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
ClankerGuru merged 2 commits into from
Apr 13, 2026
Merged

Fix PsiEnvironment thread safety in SymbolExtractor #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2fb3a7
Fix PsiEnvironment thread safety in SymbolExtractor
ClankerGuru Apr 13, 2026
e3b8779
Log full stack traces for PSI and analysis failures
ClankerGuru Apr 13, 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 src/main/kotlin/zone/clanker/gradle/srcx/parse/PsiEnvironment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class PsiEnvironment : AutoCloseable {
logger.error(
"srcx: PSI environment initialization failed: ${e.message}. " +
"Hub classes and entry points will not be available.",
e,
)
}.getOrNull()
}
Expand Down
12 changes: 8 additions & 4 deletions src/main/kotlin/zone/clanker/gradle/srcx/scan/SymbolExtractor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ object SymbolExtractor {
throw e
}
else -> {
logger.warn("srcx: Analysis failed for '$projectName': ${e.message}")
logger.warn("srcx: Analysis failed for '$projectName': ${e.message}", e)
return null
}
}
Expand All @@ -74,14 +74,17 @@ object SymbolExtractor {
}
if (sourceFiles.isEmpty()) return emptyList()

return PsiEnvironment().use { env ->
val env = PsiEnvironment.shared() ?: return emptyList()
return synchronized(env) {
val parser = PsiParser(env)
sourceFiles.flatMap { file ->
val sourceDir = dirs.first { file.startsWith(it) }
runCatching {
parser.extractDeclarations(file).map { symbol ->
symbol.toEntry(sourceDir)
}
}.onFailure { e ->
logger.warn("srcx: Symbol extraction failed for '${file.name}': ${e.message}", e)
}.getOrDefault(emptyList())
}
}
Expand Down Expand Up @@ -287,9 +290,10 @@ object SymbolExtractor {
?: File(projectDir, "build.gradle").takeIf { it.exists() }
?: return emptyList()

return PsiEnvironment().use { env ->
val env = PsiEnvironment.shared() ?: return emptyList()
return synchronized(env) {
val vf = LightVirtualFile(buildFile.name, KotlinFileType.INSTANCE, buildFile.readText())
val ktFile = env.psiManager.findFile(vf) as? KtFile ?: return@use emptyList()
val ktFile = env.psiManager.findFile(vf) as? KtFile ?: return@synchronized emptyList()

ktFile
.collectDescendantsOfType<KtCallExpression>()
Expand Down
Loading