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

Kotlin Facet: Fix argument merging

Browse Source 
#KT-16982 Fixed
This commit is contained in:
Alexey Sedunov
2017-03-21 18:12:19 +03:00
parent 7c7e41592a
commit 38f9e99d91
13 changed files with 88 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/argumentUtils.kt
+1 -1
View File
@@ -41,7 +41,7 @@ fun <T : Any> copyBean(bean: T) = copyFields(bean, bean::class.java.newInstance(
fun <From : Any, To : From> mergeBeans(from: From, to: To): To {
// TODO: rewrite when updated version of com.intellij.util.xmlb is available on TeamCity
return copyFields(from, XmlSerializerUtil.createCopy(to), false, collectFieldsToCopy(from::class.java, false))
return copyFields(from, to, false, collectFieldsToCopy(from::class.java, false))
}
fun <From : Any, To : Any> copyInheritedFields(from: From, to: To) = copyFields(from, to, true, collectFieldsToCopy(from::class.java, true))