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

Migration: expect/actual in KotlinSafeDeleteProcessor

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-09-14 20:11:11 +03:00
parent 31f4f2d0c9
commit b909704bb9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+5 -3
View File
@@ -368,6 +368,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
} }
else { else {
it.removeModifier(KtTokens.IMPL_KEYWORD) it.removeModifier(KtTokens.IMPL_KEYWORD)
it.removeModifier(KtTokens.ACTUAL_KEYWORD)
} }
} }
} }
@@ -392,6 +393,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
element.ownerFunction?.let { element.ownerFunction?.let {
if (it.dropImplModifier == true) { if (it.dropImplModifier == true) {
it.removeModifier(KtTokens.IMPL_KEYWORD) it.removeModifier(KtTokens.IMPL_KEYWORD)
it.removeModifier(KtTokens.ACTUAL_KEYWORD)
it.dropImplModifier = null 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 if (ApplicationManager.getApplication().isUnitTestMode) return parameter.project.ALLOW_LIFTING_IMPL_PARAMETER_TO_HEADER
return Messages.showYesNoDialog( 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"), RefactoringBundle.message("safe.delete.title"),
Messages.getQuestionIcon() Messages.getQuestionIcon()
) == Messages.YES ) == Messages.YES
@@ -417,7 +419,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
is KtParameter -> { is KtParameter -> {
val headerParameter = element.liftToExpected() as? KtParameter val headerParameter = element.liftToExpected() as? KtParameter
if (headerParameter != null && headerParameter != element) { if (headerParameter != null && headerParameter != element) {
if (shouldAllowPropagationToHeader(element)) { if (shouldAllowPropagationToExpected(element)) {
return listOf(headerParameter) return listOf(headerParameter)
} else { } else {
element.ownerFunction?.dropImplModifier = true element.ownerFunction?.dropImplModifier = true