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

Safe delete: when invoking on expect, delete also relevant actual

Browse Source 
Partial fix of KT-15666
This commit is contained in:
Mikhail Glukhikh
2018-06-27 13:04:24 +03:00
parent 465d5c077e
commit 50e70e4638
15 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+12 -9
View File
@@ -57,10 +57,7 @@ import org.jetbrains.kotlin.idea.util.actualsForExpected
import org.jetbrains.kotlin.idea.util.liftToExpected
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier
import org.jetbrains.kotlin.psi.psiUtil.parameterIndex
import org.jetbrains.kotlin.psi.psiUtil.*
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.utils.SmartSet
@@ -388,11 +385,17 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
override fun prepareForDeletion(element: PsiElement) {
if (element is KtDeclaration) {
element.actualsForExpected().forEach {
if (it is KtParameter) {
(it.parent as? KtParameterList)?.removeParameter(it)
} else {
it.removeModifier(KtTokens.IMPL_KEYWORD)
it.removeModifier(KtTokens.ACTUAL_KEYWORD)
when (it) {
is KtParameter -> {
(it.parent as? KtParameterList)?.removeParameter(it)
}
is KtCallableDeclaration, is KtClassOrObject, is KtTypeAlias -> {
it.delete()
}
else -> {
it.removeModifier(KtTokens.IMPL_KEYWORD)
it.removeModifier(KtTokens.ACTUAL_KEYWORD)
}
}
}
}
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt.172
+11 -6
View File
@@ -377,12 +377,17 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
override fun prepareForDeletion(element: PsiElement) {
if (element is KtDeclaration) {
element.actualsForExpected().forEach {
if (it is KtParameter) {
(it.parent as? KtParameterList)?.removeParameter(it)
}
else {
it.removeModifier(KtTokens.IMPL_KEYWORD)
it.removeModifier(KtTokens.ACTUAL_KEYWORD)
when (it) {
is KtParameter -> {
(it.parent as? KtParameterList)?.removeParameter(it)
}
is KtCallableDeclaration, is KtClassOrObject, is KtTypeAlias -> {
it.delete()
}
else -> {
it.removeModifier(KtTokens.IMPL_KEYWORD)
it.removeModifier(KtTokens.ACTUAL_KEYWORD)
}
}
}
}
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt.173
+11 -6
View File
@@ -387,12 +387,17 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
override fun prepareForDeletion(element: PsiElement) {
if (element is KtDeclaration) {
element.actualsForExpected().forEach {
if (it is KtParameter) {
(it.parent as? KtParameterList)?.removeParameter(it)
}
else {
it.removeModifier(KtTokens.IMPL_KEYWORD)
it.removeModifier(KtTokens.ACTUAL_KEYWORD)
when (it) {
is KtParameter -> {
(it.parent as? KtParameterList)?.removeParameter(it)
}
is KtCallableDeclaration, is KtClassOrObject, is KtTypeAlias -> {
it.delete()
}
else -> {
it.removeModifier(KtTokens.IMPL_KEYWORD)
it.removeModifier(KtTokens.ACTUAL_KEYWORD)
}
}
}
}
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JS/src/test/test.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
package test
open class Foo
actual class ChildOfFoo : Foo()
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JVM/src/test/test.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
package test
open class Foo
actual class ChildOfFoo : Foo()
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JS/src/test/test.kt
Vendored
-3
View File
@@ -1,9 +1,6 @@
package test
actual class Foo {
fun foo(n: Int) {
}
}
fun test(f: Foo) {
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JVM/src/test/test.kt
Vendored
-3
View File
@@ -1,9 +1,6 @@
package test
actual class Foo {
fun foo(n: Int) {
}
}
fun test(f: Foo) {
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JS/src/test/test.kt
Vendored
-1
View File
@@ -1,7 +1,6 @@
package test
actual class Foo {
val foo get() = 1
}
fun test(f: Foo) = f.foo
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JVM/src/test/test.kt
Vendored
-1
View File
@@ -1,7 +1,6 @@
package test
actual class Foo {
val foo get() = 2
}
fun test(f: Foo) = f.foo
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JS/src/test/test.kt
Vendored
-1
View File
@@ -1,7 +1,6 @@
package test
actual open class Foo {
constructor(n: Int)
}
fun test() = Foo(1)
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JVM/src/test/test.kt
Vendored
-1
View File
@@ -1,7 +1,6 @@
package test
actual open class Foo {
constructor(n: Int)
}
fun test() = Foo(2)
idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JS/src/test/test.kt
Vendored
-4
View File
@@ -1,9 +1,5 @@
package test
fun foo(n: Int) {
}
fun test() {
foo(1)
}
idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JVM/src/test/test.kt
Vendored
-4
View File
@@ -1,9 +1,5 @@
package test
fun foo(n: Int) {
}
fun test() {
foo(1)
}
idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JS/src/test/test.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
package test
val foo get() = 1
fun test() = foo
idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JVM/src/test/test.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
package test
val foo get() = 2
fun test() = foo