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

CreateExpect: add actual modifier to original class if needed

Browse Source
This commit is contained in:
Dmitry Gridin
2019-08-21 17:27:19 +07:00
parent 73ae993d81
commit 4ed56908af
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt
+3 -5
View File
@@ -159,10 +159,8 @@ class CreateExpectedClassFix(
} else } else
selectedElements selectedElements
if (originalElements.isNotEmpty()) { project.executeWriteCommand("Repair actual members") {
project.executeWriteCommand("Repair actual members") { repairActualModifiers(originalElements + klass, resultDeclarations.toSet())
repairActualModifiers(originalElements, resultDeclarations.toSet())
}
} }
generateClassOrObject(project, true, element, checker, listOfNotNull(outerExpectedClass)) generateClassOrObject(project, true, element, checker, listOfNotNull(outerExpectedClass))
@@ -271,7 +269,7 @@ private fun repairActualModifiers(
originalElements: Collection<KtNamedDeclaration>, originalElements: Collection<KtNamedDeclaration>,
selectedElements: Collection<KtNamedDeclaration> selectedElements: Collection<KtNamedDeclaration>
) { ) {
if (originalElements == selectedElements) if (originalElements.size == selectedElements.size)
for (original in originalElements) { for (original in originalElements) {
original.makeActualWithParents() original.makeActualWithParents()
} }