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

Safe delete: add dialog asking about expect / actual declarations

Browse Source 
Related to KT-15666
This commit is contained in:
Mikhail Glukhikh
2018-06-27 15:16:51 +03:00
parent aac71bf904
commit b13e4535f5
3 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+19
View File
@@ -54,6 +54,7 @@ import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchPar
import org.jetbrains.kotlin.idea.search.projectScope
import org.jetbrains.kotlin.idea.search.usagesSearch.processDelegationCallConstructorUsages
import org.jetbrains.kotlin.idea.util.actualsForExpected
import org.jetbrains.kotlin.idea.util.isExpectDeclaration
import org.jetbrains.kotlin.idea.util.liftToExpected
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.*
@@ -453,6 +454,16 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
) == Messages.YES
}
private fun shouldAllowPropagationToExpected(): Boolean {
if (ApplicationManager.getApplication().isUnitTestMode) return true
return Messages.showYesNoDialog(
"Do you want to delete expected declaration together with all related actual ones?",
RefactoringBundle.message("safe.delete.title"),
Messages.getQuestionIcon()
) == Messages.YES
}
override fun getElementsToSearch(
element: PsiElement, module: Module?, allElementsToDelete: Collection<PsiElement>
): Collection<PsiElement>? {
@@ -473,6 +484,14 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
}.ifEmpty { listOf(element) }
}
is KtDeclaration -> {
if (element.hasActualModifier() || element.isExpectDeclaration()) {
if (!shouldAllowPropagationToExpected()) {
return null
}
}
}
is PsiParameter ->
return checkParametersInMethodHierarchy(element)
}
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt.172
+19
View File
@@ -52,6 +52,7 @@ import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchPar
import org.jetbrains.kotlin.idea.search.projectScope
import org.jetbrains.kotlin.idea.search.usagesSearch.processDelegationCallConstructorUsages
import org.jetbrains.kotlin.idea.util.actualsForExpected
import org.jetbrains.kotlin.idea.util.isExpectDeclaration
import org.jetbrains.kotlin.idea.util.liftToExpected
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.*
@@ -445,6 +446,16 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
) == Messages.YES
}
private fun shouldAllowPropagationToExpected(): Boolean {
if (ApplicationManager.getApplication().isUnitTestMode) return true
return Messages.showYesNoDialog(
"Do you want to delete expected declaration together with all related actual ones?",
RefactoringBundle.message("safe.delete.title"),
Messages.getQuestionIcon()
) == Messages.YES
}
override fun getElementsToSearch(
element: PsiElement, module: Module?, allElementsToDelete: Collection<PsiElement>
): Collection<PsiElement>? {
@@ -465,6 +476,14 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
}.ifEmpty { listOf(element) }
}
is KtDeclaration -> {
if (element.hasActualModifier() || element.isExpectDeclaration()) {
if (!shouldAllowPropagationToExpected()) {
return null
}
}
}
is PsiParameter ->
return checkParametersInMethodHierarchy(element)
}
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt.173
+19
View File
@@ -54,6 +54,7 @@ import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchPar
import org.jetbrains.kotlin.idea.search.projectScope
import org.jetbrains.kotlin.idea.search.usagesSearch.processDelegationCallConstructorUsages
import org.jetbrains.kotlin.idea.util.actualsForExpected
import org.jetbrains.kotlin.idea.util.isExpectDeclaration
import org.jetbrains.kotlin.idea.util.liftToExpected
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.*
@@ -455,6 +456,16 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
) == Messages.YES
}
private fun shouldAllowPropagationToExpected(): Boolean {
if (ApplicationManager.getApplication().isUnitTestMode) return true
return Messages.showYesNoDialog(
"Do you want to delete expected declaration together with all related actual ones?",
RefactoringBundle.message("safe.delete.title"),
Messages.getQuestionIcon()
) == Messages.YES
}
override fun getElementsToSearch(
element: PsiElement, module: Module?, allElementsToDelete: Collection<PsiElement>
): Collection<PsiElement>? {
@@ -475,6 +486,14 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
}.ifEmpty { listOf(element) }
}
is KtDeclaration -> {
if (element.hasActualModifier() || element.isExpectDeclaration()) {
if (!shouldAllowPropagationToExpected()) {
return null
}
}
}
is PsiParameter ->
return checkParametersInMethodHierarchy(element)
}