From 947e853d9e0eabd4215919d5dbe240e8ff3f2460 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 22 Dec 2017 12:10:01 +0300 Subject: [PATCH] Inline dialog: show "inline all and keep" for occurred once declarations So #KT-21964 Fixed --- .../idea/refactoring/inline/AbstractKotlinInlineDialog.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt index 4aa4521812a..c526ed41e70 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt @@ -70,8 +70,12 @@ abstract class AbstractKotlinInlineDialog( override fun getKeepTheDeclarationText(): String? = // With non-writable callable refactoring does not work anyway (for both property or function) - if (callable.isWritable && occurrencesNumber > 1) "Inline all references and keep the $kind ($occurrencesString)" - else null + if (callable.isWritable && (occurrencesNumber > 1 || !myInvokedOnReference)) { + "Inline all references and keep the $kind ($occurrencesString)" + } + else { + null + } override fun getInlineThisText() = "Inline this reference and keep the $kind" } \ No newline at end of file