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

Inline dialog: show "inline all and keep" for occurred once declarations

Browse Source 
So #KT-21964 Fixed
This commit is contained in:
Mikhail Glukhikh
2017-12-22 12:10:01 +03:00
parent d5bb7e457e
commit 947e853d9e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt
+6 -2
View File
@@ -70,8 +70,12 @@ abstract class AbstractKotlinInlineDialog(
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) "Inline all references and keep the $kind ($occurrencesString)" if (callable.isWritable && (occurrencesNumber > 1 || !myInvokedOnReference)) {
else null "Inline all references and keep the $kind ($occurrencesString)"
}
else {
null
}
override fun getInlineThisText() = "Inline this reference and keep the $kind" override fun getInlineThisText() = "Inline this reference and keep the $kind"
} }