Safe delete: when invoking on actual, delete expect & actual neighbors

So #KT-15666 Fixed

idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt

@@ -382,21 +382,35 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
         return result.toTypedArray()
     }
 
+    private fun KtDeclaration.removeOrClean() {
+        when (this) {
+            is KtParameter -> {
+                (parent as? KtParameterList)?.removeParameter(this)
+            }
+            is KtCallableDeclaration, is KtClassOrObject, is KtTypeAlias -> {
+                delete()
+            }
+            else -> {
+                removeModifier(KtTokens.IMPL_KEYWORD)
+                removeModifier(KtTokens.ACTUAL_KEYWORD)
+            }
+        }
+    }
+
     override fun prepareForDeletion(element: PsiElement) {
         if (element is KtDeclaration) {
-            element.actualsForExpected().forEach {
+            if (element.hasActualModifier()) {
-                when (it) {
+                val expectElement = element.liftToExpected()
-                    is KtParameter -> {
+                expectElement?.actualsForExpected()?.forEach {
-                        (it.parent as? KtParameterList)?.removeParameter(it)
+                    if (it !== element) {
-                    }
+                        it.removeOrClean()
-                    is KtCallableDeclaration, is KtClassOrObject, is KtTypeAlias -> {
-                        it.delete()
-                    }
-                    else -> {
-                        it.removeModifier(KtTokens.IMPL_KEYWORD)
-                        it.removeModifier(KtTokens.ACTUAL_KEYWORD)
                     }
                 }
+                expectElement?.removeOrClean()
+            } else {
+                element.actualsForExpected().forEach {
+                    it.removeOrClean()
+                }
             }
         }
 

idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt.172

@@ -374,21 +374,35 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
         return result.toTypedArray()
     }
 
+    private fun KtDeclaration.removeOrClean() {
+        when (this) {
+            is KtParameter -> {
+                (parent as? KtParameterList)?.removeParameter(this)
+            }
+            is KtCallableDeclaration, is KtClassOrObject, is KtTypeAlias -> {
+                delete()
+            }
+            else -> {
+                removeModifier(KtTokens.IMPL_KEYWORD)
+                removeModifier(KtTokens.ACTUAL_KEYWORD)
+            }
+        }
+    }
+
     override fun prepareForDeletion(element: PsiElement) {
         if (element is KtDeclaration) {
-            element.actualsForExpected().forEach {
+            if (element.hasActualModifier()) {
-                when (it) {
+                val expectElement = element.liftToExpected()
-                    is KtParameter -> {
+                expectElement?.actualsForExpected()?.forEach {
-                        (it.parent as? KtParameterList)?.removeParameter(it)
+                    if (it !== element) {
-                    }
+                        it.removeOrClean()
-                    is KtCallableDeclaration, is KtClassOrObject, is KtTypeAlias -> {
-                        it.delete()
-                    }
-                    else -> {
-                        it.removeModifier(KtTokens.IMPL_KEYWORD)
-                        it.removeModifier(KtTokens.ACTUAL_KEYWORD)
                     }
                 }
+                expectElement?.removeOrClean()
+            } else {
+                element.actualsForExpected().forEach {
+                    it.removeOrClean()
+                }
             }
         }
 

idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt.173

@@ -384,21 +384,35 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
         return result.toTypedArray()
     }
 
+    private fun KtDeclaration.removeOrClean() {
+        when (this) {
+            is KtParameter -> {
+                (parent as? KtParameterList)?.removeParameter(this)
+            }
+            is KtCallableDeclaration, is KtClassOrObject, is KtTypeAlias -> {
+                delete()
+            }
+            else -> {
+                removeModifier(KtTokens.IMPL_KEYWORD)
+                removeModifier(KtTokens.ACTUAL_KEYWORD)
+            }
+        }
+    }
+
     override fun prepareForDeletion(element: PsiElement) {
         if (element is KtDeclaration) {
-            element.actualsForExpected().forEach {
+            if (element.hasActualModifier()) {
-                when (it) {
+                val expectElement = element.liftToExpected()
-                    is KtParameter -> {
+                expectElement?.actualsForExpected()?.forEach {
-                        (it.parent as? KtParameterList)?.removeParameter(it)
+                    if (it !== element) {
-                    }
+                        it.removeOrClean()
-                    is KtCallableDeclaration, is KtClassOrObject, is KtTypeAlias -> {
-                        it.delete()
-                    }
-                    else -> {
-                        it.removeModifier(KtTokens.IMPL_KEYWORD)
-                        it.removeModifier(KtTokens.ACTUAL_KEYWORD)
                     }
                 }
+                expectElement?.removeOrClean()
+            } else {
+                element.actualsForExpected().forEach {
+                    it.removeOrClean()
+                }
             }
         }
 

idea/testData/multiModuleQuickFix/safeDeleteFromActual/common/common.kt

@@ -1,4 +1,3 @@
 expect class My constructor() {
-    // TODO: also should be deleted (KT-15666)
     fun foo()
 }

idea/testData/multiModuleQuickFix/safeDeleteFromActual/common/common.kt.after

@@ -1,4 +1,2 @@
 expect class My constructor() {
-    // TODO: also should be deleted (KT-15666)
-    fun foo()
 }

idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/Common/src/test/test.kt

@@ -1,4 +1,3 @@
 package test
 
-expect open class Foo
 expect class ChildOfFoo : Foo()

idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JVM/src/test/test.kt

@@ -1,4 +1,3 @@
 package test
 
-actual open class Foo
 actual class ChildOfFoo : Foo()

idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/Common/src/test/test.kt

@@ -1,7 +1,6 @@
 package test
 
 expect class Foo {
-    fun foo(n: Int)
 }
 
 fun test(f: Foo) {

idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JVM/src/test/test.kt

@@ -1,9 +1,6 @@
 package test
 
 actual class Foo {
-    actual fun foo(n: Int) {
-
-    }
 }
 
 fun test(f: Foo) {

idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/Common/src/test/test.kt

@@ -1,7 +1,6 @@
 package test
 
 expect class Foo {
-    val foo: Int
 }
 
 fun test(f: Foo) = f.foo

idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JVM/src/test/test.kt

@@ -1,7 +1,6 @@
 package test
 
 actual class Foo {
-    actual val foo get() = 2
 }
 
 fun test(f: Foo) = f.foo

idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/Common/src/test/test.kt

@@ -1,7 +1,6 @@
 package test
 
 expect open class Foo {
-    constructor(n: Int)
 }
 
 fun test() = Foo(1)

idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JVM/src/test/test.kt

@@ -1,7 +1,6 @@
 package test
 
 actual open class Foo {
-    actual constructor(n: Int)
 }
 
 fun test() = Foo(2)

idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/Common/src/test/test.kt

@@ -1,7 +1,5 @@
 package test
 
-expect fun foo(n: Int)
-
 fun test() {
     foo(1)
 }

idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JVM/src/test/test.kt

@@ -1,9 +1,5 @@
 package test
 
-actual fun foo(n: Int) {
-
-}
-
 fun test() {
     foo(1)
 }

idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/Common/src/test/test.kt

@@ -1,5 +1,3 @@
 package test
 
-expect val foo: Int
-
 fun test() = foo

idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JVM/src/test/test.kt

@@ -1,5 +1,3 @@
 package test
 
-actual val foo get() = 2
-
 fun test() = foo