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

Post KotlinNativeABICompatibilityChecker startup activity conversion clean up

Browse Source 
Relates to #KT-38318
This commit is contained in:
Vladimir Dolzhenko
2020-04-20 09:35:44 +02:00
parent 3d4c5b0091
commit d8b4ff9eab
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeABICompatibilityChecker.kt
+7 -3
View File
@@ -48,10 +48,10 @@ class KotlinNativeABICompatibilityChecker : StartupActivity {
object User : LibraryGroup(2) object User : LibraryGroup(2)
} }
private val cachedIncompatibleLibraries = HashSet<String>() private val cachedIncompatibleLibrariesPerProject = mutableMapOf<Project, MutableSet<String>>()
override fun runActivity(project: Project) { override fun runActivity(project: Project) {
project.messageBus.connect().subscribe(ProjectTopics.PROJECT_ROOTS, object : ModuleRootListener { project.messageBus.connect(project).subscribe(ProjectTopics.PROJECT_ROOTS, object : ModuleRootListener {
override fun rootsChanged(event: ModuleRootEvent) { override fun rootsChanged(event: ModuleRootEvent) {
// run when project roots are changes, e.g. on project import // run when project roots are changes, e.g. on project import
validateKotlinNativeLibraries(project) validateKotlinNativeLibraries(project)
@@ -66,7 +66,10 @@ class KotlinNativeABICompatibilityChecker : StartupActivity {
return return
val backgroundJob: Ref<CancellablePromise<*>> = Ref() val backgroundJob: Ref<CancellablePromise<*>> = Ref()
val disposable = Disposable { backgroundJob.get()?.let(CancellablePromise<*>::cancel) } val disposable = Disposable {
cachedIncompatibleLibrariesPerProject.remove(project)
backgroundJob.get()?.let(CancellablePromise<*>::cancel)
}
Disposer.register(project, disposable) Disposer.register(project, disposable)
backgroundJob.set( backgroundJob.set(
@@ -95,6 +98,7 @@ class KotlinNativeABICompatibilityChecker : StartupActivity {
.filter { !it.compatibilityInfo.isCompatible } .filter { !it.compatibilityInfo.isCompatible }
.associateBy { it.libraryRoot } .associateBy { it.libraryRoot }
val cachedIncompatibleLibraries = cachedIncompatibleLibrariesPerProject.computeIfAbsent(project) { mutableSetOf() }
val newEntries = if (cachedIncompatibleLibraries.isNotEmpty()) val newEntries = if (cachedIncompatibleLibraries.isNotEmpty())
incompatibleLibraries.filterKeys { it !in cachedIncompatibleLibraries } incompatibleLibraries.filterKeys { it !in cachedIncompatibleLibraries }
else else