From b909704bb9cf5442314bc6e3034f233667cf5daa Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Thu, 14 Sep 2017 20:11:11 +0300
Subject: [PATCH] Migration: expect/actual in KotlinSafeDeleteProcessor

---
 .../refactoring/safeDelete/KotlinSafeDeleteProcessor.kt   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
index 95889573da7..9fd516c1fdc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
@@ -368,6 +368,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
                 }
                 else {
                     it.removeModifier(KtTokens.IMPL_KEYWORD)
+                    it.removeModifier(KtTokens.ACTUAL_KEYWORD)
                 }
             }
         }
@@ -392,6 +393,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
                 element.ownerFunction?.let {
                     if (it.dropImplModifier == true) {
                         it.removeModifier(KtTokens.IMPL_KEYWORD)
+                        it.removeModifier(KtTokens.ACTUAL_KEYWORD)
                         it.dropImplModifier = null
                     }
                 }
@@ -400,11 +402,11 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
         }
     }
 
-    private fun shouldAllowPropagationToHeader(parameter: KtParameter): Boolean {
+    private fun shouldAllowPropagationToExpected(parameter: KtParameter): Boolean {
         if (ApplicationManager.getApplication().isUnitTestMode) return parameter.project.ALLOW_LIFTING_IMPL_PARAMETER_TO_HEADER
 
         return Messages.showYesNoDialog(
-                "Do you want to delete this parameter in header declaration and all its implementations?",
+                "Do you want to delete this parameter in expected declaration and all related actual ones?",
                 RefactoringBundle.message("safe.delete.title"),
                 Messages.getQuestionIcon()
         ) == Messages.YES
@@ -417,7 +419,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
             is KtParameter -> {
                 val headerParameter = element.liftToExpected() as? KtParameter
                 if (headerParameter != null && headerParameter != element) {
-                    if (shouldAllowPropagationToHeader(element)) {
+                    if (shouldAllowPropagationToExpected(element)) {
                         return listOf(headerParameter)
                     } else {
                         element.ownerFunction?.dropImplModifier = true