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

202: Fix KotlinJpsBuildTest tests

Browse Source 
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`
This commit is contained in:
Nikita Bobko
2020-06-24 15:08:18 +03:00
parent 4e65b2fb9e
commit 6985c5fd2a
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/kotlin/jps/model/Serializer.kt
+6 -7
View File
@@ -10,17 +10,16 @@ import org.jdom.Element
import org.jetbrains.jps.model.JpsElement import org.jetbrains.jps.model.JpsElement
import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.JpsProject
import org.jetbrains.jps.model.module.JpsModule 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.JpsProjectExtensionSerializer
import org.jetbrains.jps.model.serialization.facet.JpsFacetConfigurationSerializer import org.jetbrains.jps.model.serialization.facet.JpsFacetConfigurationSerializer
import org.jetbrains.kotlin.cli.common.arguments.* import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.config.CompilerSettings import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
import org.jetbrains.kotlin.config.SettingConstants import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.config.deserializeFacetSettings import org.jetbrains.kotlin.cli.common.arguments.setApiVersionToLanguageVersionIfNeeded
import org.jetbrains.kotlin.config.serializeFacetSettings import org.jetbrains.kotlin.config.*
import java.util.* import java.util.*
class KotlinModelSerializerService : JpsModelSerializerExtension() { class KotlinModelSerializerService : KotlinCommonJpsModelSerializerExtension() {
override fun getProjectExtensionSerializers() = listOf( override fun getProjectExtensionSerializers() = listOf(
KotlinCommonCompilerArgumentsSerializer(), KotlinCommonCompilerArgumentsSerializer(),
Kotlin2JvmCompilerArgumentsSerializer(), Kotlin2JvmCompilerArgumentsSerializer(),