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

Inline dialog: handle case with unknown occurrence number correctly

Browse Source 
So #KT-21963 Fixed
This commit is contained in:
Mikhail Glukhikh
2017-12-22 12:30:32 +03:00
parent 947e853d9e
commit 232ec63121
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt
+7 -5
View File
@@ -30,6 +30,7 @@ abstract class AbstractKotlinInlineDialog(
project: Project = callable.project project: Project = callable.project
) : InlineOptionsDialog(project, true, callable) { ) : InlineOptionsDialog(project, true, callable) {
// NB: can be -1 in case of too expensive search!
protected val occurrencesNumber = initOccurrencesNumber(callable) protected val occurrencesNumber = initOccurrencesNumber(callable)
private val occurrencesString get() = if (occurrencesNumber >= 0) { private val occurrencesString get() = if (occurrencesNumber >= 0) {
@@ -59,19 +60,20 @@ abstract class AbstractKotlinInlineDialog(
override fun getBorderTitle() = refactoringName override fun getBorderTitle() = refactoringName
override fun getNameLabelText(): String { override fun getNameLabelText(): String {
val occurrencesString = val occurrencesString = occurrencesString?.let { " - $it" } ?: ""
if (occurrencesNumber >= 0) " - $occurrencesString"
else ""
return "${kind.capitalize()} ${callable.nameAsSafeName} $occurrencesString" return "${kind.capitalize()} ${callable.nameAsSafeName} $occurrencesString"
} }
private fun getInlineText(verb: String) =
"Inline all references and $verb the $kind " + (occurrencesString?.let { "($it)" } ?: "")
override fun getInlineAllText() = override fun getInlineAllText() =
"Inline all references and remove the $kind ($occurrencesString)" getInlineText("remove")
override fun getKeepTheDeclarationText(): String? = override fun getKeepTheDeclarationText(): String? =
// With non-writable callable refactoring does not work anyway (for both property or function) // With non-writable callable refactoring does not work anyway (for both property or function)
if (callable.isWritable && (occurrencesNumber > 1 || !myInvokedOnReference)) { if (callable.isWritable && (occurrencesNumber > 1 || !myInvokedOnReference)) {
"Inline all references and keep the $kind ($occurrencesString)" getInlineText("keep")
} }
else { else {
null null