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

Inline function: use "function" in GUI messages

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-03-30 13:32:20 +03:00
parent 93b624fdbe
commit fc0bf47067
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionDialog.kt
+9 -10
View File
@@ -41,7 +41,7 @@ class KotlinInlineFunctionDialog(
init { init {
myInvokedOnReference = reference != null myInvokedOnReference = reference != null
title = RefactoringBundle.message("inline.method.title") title = "Inline function"
init() init()
} }
@@ -51,23 +51,22 @@ class KotlinInlineFunctionDialog(
val occurrencesString = val occurrencesString =
if (occurrencesNumber > -1) " - $occurrencesNumber occurrence${if (occurrencesNumber == 1) "" else "s"}" if (occurrencesNumber > -1) " - $occurrencesNumber occurrence${if (occurrencesNumber == 1) "" else "s"}"
else "" else ""
val methodText = "${function.nameAsSafeName}" + function.valueParameters.joinToString(prefix = "(", postfix = ")") { val functionText = "${function.nameAsSafeName}" + function.valueParameters.joinToString(prefix = "(", postfix = ")") {
"${it.nameAsSafeName}: ${it.typeReference?.text}" "${it.nameAsSafeName}: ${it.typeReference?.text}"
} + (function.getReturnTypeReference()?.let { ": " + it.text } ?: "") } + (function.getReturnTypeReference()?.let { ": " + it.text } ?: "")
return RefactoringBundle.message("inline.method.method.label", methodText, occurrencesString) return "Function $functionText $occurrencesString"
} }
override fun getBorderTitle(): String = RefactoringBundle.message("inline.method.border.title") override fun getBorderTitle() = "Inline"
override fun getInlineThisText(): String = RefactoringBundle.message("this.invocation.only.and.keep.the.method") override fun getInlineThisText() = "Inline this only and keep the function"
override fun getInlineAllText(): String = RefactoringBundle.message( override fun getInlineAllText() =
if (function.isWritable) "all.invocations.and.remove.the.method" if (function.isWritable) "Inline all and remove the function"
else "all.invocations.in.project" else "All invocations in project"
)
override fun getKeepTheDeclarationText(): String = override fun getKeepTheDeclarationText(): String =
if (function.isWritable) RefactoringBundle.message("all.invocations.keep.the.method") if (function.isWritable) "Inline all and keep the function"
else super.getKeepTheDeclarationText() else super.getKeepTheDeclarationText()
public override fun doAction() { public override fun doAction() {
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionProcessor.kt
+2 -3
View File
@@ -42,7 +42,7 @@ class KotlinInlineFunctionProcessor(
private val deleteAfter: Boolean private val deleteAfter: Boolean
) : BaseRefactoringProcessor(project) { ) : BaseRefactoringProcessor(project) {
private val commandName = RefactoringBundle.message("inline.method.command", DescriptiveNameUtil.getDescriptiveName(function)) private val commandName = "Inlining function ${DescriptiveNameUtil.getDescriptiveName(function)}"
override fun findUsages(): Array<UsageInfo> { override fun findUsages(): Array<UsageInfo> {
if (inlineThisOnly && reference != null) return arrayOf(UsageInfo(reference)) if (inlineThisOnly && reference != null) return arrayOf(UsageInfo(reference))
@@ -75,8 +75,7 @@ class KotlinInlineFunctionProcessor(
override fun getElements() = arrayOf(function) override fun getElements() = arrayOf(function)
override fun getProcessedElementsHeader(): String = override fun getProcessedElementsHeader() = "Function to inline"
RefactoringBundle.message("inline.method.elements.header")
} }
} }
} }