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

Misc: Fix deserialization of CommonCompilerArguments.freeArgs

Browse Source 
#KT-20938 Fixed

Original commit: cfad305826
This commit is contained in:
Alexey Sedunov
2017-10-25 12:30:11 +03:00
parent cfbb0f1b00
commit 70778b1062
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
+2 -3
View File
@@ -58,8 +58,7 @@ private fun readV1Config(element: Element): KotlinFacetSettings {
val jvmArgumentsElement = compilerInfoElement?.getOptionBody("k2jvmCompilerArguments") val jvmArgumentsElement = compilerInfoElement?.getOptionBody("k2jvmCompilerArguments")
val jsArgumentsElement = compilerInfoElement?.getOptionBody("k2jsCompilerArguments") val jsArgumentsElement = compilerInfoElement?.getOptionBody("k2jsCompilerArguments")
val compilerArguments = targetPlatform.createCompilerArguments() val compilerArguments = targetPlatform.createCompilerArguments { freeArgs = ArrayList() }
compilerArguments.freeArgs = ArrayList()
commonArgumentsElement?.let { XmlSerializer.deserializeInto(compilerArguments, it) } commonArgumentsElement?.let { XmlSerializer.deserializeInto(compilerArguments, it) }
when (compilerArguments) { when (compilerArguments) {
@@ -105,7 +104,7 @@ private fun readV2AndLaterConfig(element: Element): KotlinFacetSettings {
XmlSerializer.deserializeInto(compilerSettings!!, it) XmlSerializer.deserializeInto(compilerSettings!!, it)
} }
element.getChild("compilerArguments")?.let { element.getChild("compilerArguments")?.let {
compilerArguments = platformKind.createCompilerArguments() compilerArguments = platformKind.createCompilerArguments { freeArgs = ArrayList() }
XmlSerializer.deserializeInto(compilerArguments!!, it) XmlSerializer.deserializeInto(compilerArguments!!, it)
} }
testOutputPath = element.getChild("testOutputPath")?.let { testOutputPath = element.getChild("testOutputPath")?.let {