From 4ed56908af8e2a25dce27caf002e80051aea0c70 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Wed, 21 Aug 2019 17:27:19 +0700
Subject: [PATCH] CreateExpect: add `actual` modifier to original class if
 needed

---
 .../idea/quickfix/expectactual/CreateExpectedFix.kt       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt
index 62b4b8d2d4d..6205aedfa60 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt
@@ -159,10 +159,8 @@ class CreateExpectedClassFix(
     } else
         selectedElements
 
-    if (originalElements.isNotEmpty()) {
-        project.executeWriteCommand("Repair actual members") {
-            repairActualModifiers(originalElements, resultDeclarations.toSet())
-        }
+    project.executeWriteCommand("Repair actual members") {
+        repairActualModifiers(originalElements + klass, resultDeclarations.toSet())
     }
 
     generateClassOrObject(project, true, element, checker, listOfNotNull(outerExpectedClass))
@@ -271,7 +269,7 @@ private fun repairActualModifiers(
     originalElements: Collection<KtNamedDeclaration>,
     selectedElements: Collection<KtNamedDeclaration>
 ) {
-    if (originalElements == selectedElements)
+    if (originalElements.size == selectedElements.size)
         for (original in originalElements) {
             original.makeActualWithParents()
         }