From c818141d159af97100a6bcd078dce765a8c16f7a Mon Sep 17 00:00:00 2001
From: Nikita Bobko <nikita.bobko@jetbrains.com>
Date: Wed, 24 Jun 2020 15:08:18 +0300
Subject: [PATCH] 202: Fix `KotlinJpsBuildTest` tests

Test failure was caused by "replace custom source root types to a special
'unknown' type and back on plugin unload/load (IDEA-235292)" in intellij.

We override `getModuleSourceRootPropertiesSerializers` in `KotlinModelSerializerService`
by inheriting from `KotlinCommonJpsModelSerializerExtension`

Original commit: 6985c5fd2a0b1f099607b37392233c88beb60562
---
 .../org/jetbrains/kotlin/jps/model/Serializer.kt    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Serializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Serializer.kt
index bf198262e46..01f47614d54 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Serializer.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Serializer.kt
@@ -10,17 +10,16 @@ import org.jdom.Element
 import org.jetbrains.jps.model.JpsElement
 import org.jetbrains.jps.model.JpsProject
 import org.jetbrains.jps.model.module.JpsModule
-import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
 import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer
 import org.jetbrains.jps.model.serialization.facet.JpsFacetConfigurationSerializer
-import org.jetbrains.kotlin.cli.common.arguments.*
-import org.jetbrains.kotlin.config.CompilerSettings
-import org.jetbrains.kotlin.config.SettingConstants
-import org.jetbrains.kotlin.config.deserializeFacetSettings
-import org.jetbrains.kotlin.config.serializeFacetSettings
+import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
+import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
+import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
+import org.jetbrains.kotlin.cli.common.arguments.setApiVersionToLanguageVersionIfNeeded
+import org.jetbrains.kotlin.config.*
 import java.util.*
 
-class KotlinModelSerializerService : JpsModelSerializerExtension() {
+class KotlinModelSerializerService : KotlinCommonJpsModelSerializerExtension() {
     override fun getProjectExtensionSerializers() = listOf(
         KotlinCommonCompilerArgumentsSerializer(),
         Kotlin2JvmCompilerArgumentsSerializer(),