From a0d0bc074bc499204e5c4a75c65c319daa5fed51 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 30 Jan 2018 16:32:20 +0300 Subject: [PATCH] Cleanup: KotlinPullUpHelper --- .../kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt index 5c6e239c87e..bd35d9f96de 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt @@ -191,7 +191,7 @@ class KotlinPullUpHelper( private val targetToSourceConstructors = LinkedHashMap>().let { result -> if (!data.isInterfaceTarget && data.targetClass is KtClass) { - result[data.targetClass.primaryConstructor ?: data.targetClass] = ArrayList() + result[data.targetClass.primaryConstructor ?: data.targetClass] = ArrayList() data.sourceClass.accept( object : KtTreeVisitorVoid() { private fun processConstructorReference(expression: KtReferenceExpression, callingConstructorElement: KtElement) { @@ -626,7 +626,7 @@ class KotlinPullUpHelper( for ((constructorElement, propertyToInitializerInfo) in targetConstructorToPropertyInitializerInfoMap.entries) { val properties = propertyToInitializerInfo.keys.sortedWith( - Comparator { property1, property2 -> + Comparator { property1, property2 -> val info1 = propertyToInitializerInfo[property1]!! val info2 = propertyToInitializerInfo[property2]!! when {