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

Kotlin Facet: Do not rewrite v2 configuration to latest version

Browse Source 
This causes unwanted changes in configuration files
after plugin update

Original commit: 151b512a6c
This commit is contained in:
Alexey Sedunov
2017-05-19 14:51:05 +03:00
parent 0fbb7719c5
commit f679043929
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+1
View File
@@ -80,6 +80,7 @@ class KotlinFacetSettings {
val DEFAULT_VERSION = 0
}
var version = CURRENT_VERSION
var useProjectSettings: Boolean = true
var compilerArguments: CommonCompilerArguments? = null
jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
+35 -4
View File
@@ -132,8 +132,8 @@ fun deserializeFacetSettings(element: Element): KotlinFacetSettings {
1 -> readV1Config(element)
2 -> readV2Config(element)
KotlinFacetSettings.CURRENT_VERSION -> readLatestConfig(element)
else -> KotlinFacetSettings() // Reset facet configuration if versions don't match
}
else -> return KotlinFacetSettings() // Reset facet configuration if versions don't match
}.apply { this.version = version }
}
fun CommonCompilerArguments.convertPathsToSystemIndependent() {
@@ -166,10 +166,9 @@ fun CompilerSettings.convertPathsToSystemIndependent() {
outputDirectoryForJsLibraryFiles = PathUtil.toSystemIndependentName(outputDirectoryForJsLibraryFiles)
}
fun KotlinFacetSettings.serializeFacetSettings(element: Element) {
private fun KotlinFacetSettings.writeLatestConfig(element: Element) {
val filter = SkipDefaultsSerializationFilter()
element.setAttribute("version", KotlinFacetSettings.CURRENT_VERSION.toString())
targetPlatformKind?.let {
element.setAttribute("platform", it.description)
}
@@ -191,3 +190,35 @@ fun KotlinFacetSettings.serializeFacetSettings(element: Element) {
}
}
}
// Special treatment of v2 may be dropped after transition to IDEA 172
private fun KotlinFacetSettings.writeV2Config(element: Element) {
writeLatestConfig(element)
element.getChild("compilerArguments")?.let {
it.getOption("coroutinesState")?.detach()
val coroutineOption = when (compilerArguments?.coroutinesState) {
CommonCompilerArguments.ENABLE -> "coroutinesEnable"
CommonCompilerArguments.WARN -> "coroutinesWarn"
CommonCompilerArguments.ERROR -> "coroutinesError"
else -> null
}
if (coroutineOption != null) {
Element("option").apply {
setAttribute("name", coroutineOption)
setAttribute("value", "true")
it.addContent(this)
}
}
}
}
fun KotlinFacetSettings.serializeFacetSettings(element: Element) {
val versionToWrite = if (version == 2) version else KotlinFacetSettings.CURRENT_VERSION
element.setAttribute("version", versionToWrite.toString())
if (versionToWrite == 2) {
writeV2Config(element)
}
else {
writeLatestConfig(element)
}
}