azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[kotlin] fix AssertionError: Alien file! in IJ test

Browse Source 
We should not cache `VirtualFile` per-application
This commit is contained in:
Ilya Kirillov
2023-08-30 21:00:59 +02:00
committed by Space Team
parent 1766c68e9c
commit 103ebb0ab4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/BuiltInsVirtualFileProvider.kt
+8 -8
View File
@@ -24,25 +24,25 @@ abstract class BuiltInsVirtualFileProvider {
}
abstract class BuiltInsVirtualFileProviderBaseImpl : BuiltInsVirtualFileProvider() {
private val builtinFiles: Set<VirtualFile> by lazy {
private val builtInUrls: Set<URL> by lazy {
val classLoader = this::class.java.classLoader
StandardClassIds.builtInsPackages.mapTo(mutableSetOf()) { builtInPackageFqName ->
val resourcePath = BuiltInSerializerProtocol.getBuiltInsFilePath(builtInPackageFqName)
val resourceUrl = classLoader.getResource(resourcePath)
classLoader.getResource(resourcePath)
?: errorWithAttachment("Resource for builtin $builtInPackageFqName not found") {
withEntry("resourcePath", resourcePath)
}
findVirtualFile(resourceUrl)
?: errorWithAttachment("Virtual file for builtin $builtInPackageFqName not found") {
withEntry("resourcePath", resourcePath)
withEntry("resourceUrl", resourceUrl) { it.toString() }
}
}
}
protected abstract fun findVirtualFile(url: URL): VirtualFile?
override fun getBuiltInVirtualFiles(): Set<VirtualFile> = builtinFiles
override fun getBuiltInVirtualFiles(): Set<VirtualFile> = builtInUrls.mapTo(mutableSetOf()) { url ->
findVirtualFile(url)
?: errorWithAttachment("Virtual file for builtin is not found") {
withEntry("resourceUrl", url) { it.toString() }
}
}
}
class BuiltInsVirtualFileProviderCliImpl(