diff --git a/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationImportHandler.kt b/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationImportHandler.kt index 7e923fb5c8a..c0168341a43 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationImportHandler.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationImportHandler.kt @@ -16,14 +16,20 @@ package org.jetbrains.kotlinx.serialization.idea -import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.idea.facet.KotlinFacet +import org.jetbrains.kotlin.utils.PathUtil import java.io.File internal object KotlinSerializationImportHandler { + private const val pluginJpsJarName = "kotlinx-serialization-compiler-plugin.jar" + val PLUGIN_JPS_JAR: String - get() = File(PathUtil.kotlinPathsForIdeaPlugin.libPath, "kotlinx-serialization-compiler-plugin.jar").absolutePath + get() = File(PathUtil.kotlinPathsForIdeaPlugin.libPath, pluginJpsJarName).absolutePath + + fun isPluginJarPath(path: String): Boolean { + return path.endsWith(pluginJpsJarName) + } fun modifyCompilerArguments(facet: KotlinFacet, buildSystemPluginJar: String) { val facetSettings = facet.configuration.settings diff --git a/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/SerializationSwitchUtils.kt b/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/SerializationSwitchUtils.kt index 2c2cef9ae7c..38dc51c1613 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/SerializationSwitchUtils.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/SerializationSwitchUtils.kt @@ -15,7 +15,7 @@ fun getIfEnabledOn(clazz: ClassDescriptor, body: () -> T): T? { val module = clazz.module.getCapability(ModuleInfo.Capability)?.unwrapModuleSourceInfo()?.module ?: return null val facet = KotlinFacet.get(module) ?: return null val pluginClasspath = facet.configuration.settings.compilerArguments?.pluginClasspaths ?: return null - if (pluginClasspath.none { it == KotlinSerializationImportHandler.PLUGIN_JPS_JAR }) return null + if (pluginClasspath.none(KotlinSerializationImportHandler::isPluginJarPath)) return null return body() }