From 43007f90f2572a66ce599027cd0d934fe1697159 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Wed, 16 Oct 2024 11:31:09 +0200 Subject: [PATCH] KTIJ-31273 [kotlin] Cleanup `KtCompilerPluginsProviderIdeImpl` Use common `isKotlinFacet` utility to check for Kotlin facets GitOrigin-RevId: 60983d171573cc6caa19ee05fa7a7b91ad5600c7 --- .../extensions/KtCompilerPluginsProviderIdeImpl.kt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/extensions/KtCompilerPluginsProviderIdeImpl.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/extensions/KtCompilerPluginsProviderIdeImpl.kt index 788898a4247b..41211d80b66c 100644 --- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/extensions/KtCompilerPluginsProviderIdeImpl.kt +++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/extensions/KtCompilerPluginsProviderIdeImpl.kt @@ -48,7 +48,7 @@ import org.jetbrains.kotlin.idea.base.util.caching.getChanges import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerSettingsListener import org.jetbrains.kotlin.idea.facet.KotlinFacet -import org.jetbrains.kotlin.idea.facet.KotlinFacetType +import org.jetbrains.kotlin.idea.facet.isKotlinFacet import org.jetbrains.kotlin.util.ServiceLoaderLite import java.io.File import java.nio.file.Path @@ -74,7 +74,8 @@ internal class KtCompilerPluginsProviderIdeImpl( cs.launch { WorkspaceModel.getInstance(project).eventLog.collect { event -> val hasChanges = event.getChanges().any { change -> - change.facetTypes.any { it == KotlinFacetType.ID } + val entities = listOfNotNull(change.oldEntity, change.newEntity) + entities.any { it.isKotlinFacet() } } if (hasChanges) { resetPluginsCache() @@ -100,13 +101,6 @@ internal class KtCompilerPluginsProviderIdeImpl( ) } - private val EntityChange.facetTypes: List - get() = when (this) { - is EntityChange.Added -> listOf(newEntity.typeId.name) - is EntityChange.Removed -> listOf(oldEntity.typeId.name) - is EntityChange.Replaced -> listOf(oldEntity.typeId.name, newEntity.typeId.name) - } - private fun createNewCache(): PluginsCache? { if (!project.isTrusted()) return null val pluginsClassLoader: UrlClassLoader = UrlClassLoader.build().apply {