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

Cleanup: KotlinPullUpHelper

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-01-30 16:32:20 +03:00
parent cefa17f877
commit a0d0bc074b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt
+2 -2
View File
@@ -191,7 +191,7 @@ class KotlinPullUpHelper(
private val targetToSourceConstructors = LinkedHashMap<KtElement, MutableList<KtElement>>().let { result -> private val targetToSourceConstructors = LinkedHashMap<KtElement, MutableList<KtElement>>().let { result ->
if (!data.isInterfaceTarget && data.targetClass is KtClass) { if (!data.isInterfaceTarget && data.targetClass is KtClass) {
result[data.targetClass.primaryConstructor ?: data.targetClass] = ArrayList<KtElement>() result[data.targetClass.primaryConstructor ?: data.targetClass] = ArrayList()
data.sourceClass.accept( data.sourceClass.accept(
object : KtTreeVisitorVoid() { object : KtTreeVisitorVoid() {
private fun processConstructorReference(expression: KtReferenceExpression, callingConstructorElement: KtElement) { private fun processConstructorReference(expression: KtReferenceExpression, callingConstructorElement: KtElement) {
@@ -626,7 +626,7 @@ class KotlinPullUpHelper(
for ((constructorElement, propertyToInitializerInfo) in targetConstructorToPropertyInitializerInfoMap.entries) { for ((constructorElement, propertyToInitializerInfo) in targetConstructorToPropertyInitializerInfoMap.entries) {
val properties = propertyToInitializerInfo.keys.sortedWith( val properties = propertyToInitializerInfo.keys.sortedWith(
Comparator<KtProperty> { property1, property2 -> Comparator { property1, property2 ->
val info1 = propertyToInitializerInfo[property1]!! val info1 = propertyToInitializerInfo[property1]!!
val info2 = propertyToInitializerInfo[property2]!! val info2 = propertyToInitializerInfo[property2]!!
when { when {