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

FIR IDE: fix SOE on opening project

Browse Source 
Kotlin library may contain cycles which causes SOE in FirModuleInfoBasedModuleData.dependencies
This commit is contained in:
Ilya Kirillov
2021-05-17 19:21:17 +02:00
parent d365d7c784
commit aa70c952eb
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirModuleInfoBasedModuleData.kt
+6 -3
View File
@@ -14,9 +14,12 @@ import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices
class FirModuleInfoBasedModuleData(val moduleInfo: ModuleInfo) : FirModuleData() { class FirModuleInfoBasedModuleData(val moduleInfo: ModuleInfo) : FirModuleData() {
override val name: Name override val name: Name
get() = moduleInfo.name get() = moduleInfo.name
override val dependencies: List<FirModuleData> = moduleInfo.dependencies()
.filterNot { it == moduleInfo } override val dependencies: List<FirModuleData> by lazy {
.map { FirModuleInfoBasedModuleData(it) } moduleInfo.dependencies()
.filterNot { it == moduleInfo }
.map { FirModuleInfoBasedModuleData(it) }
}
override val dependsOnDependencies: List<FirModuleData> = moduleInfo.expectedBy override val dependsOnDependencies: List<FirModuleData> = moduleInfo.expectedBy
.filterNot { it == moduleInfo } .filterNot { it == moduleInfo }