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

Minor: Extract name comparison

Browse Source
This commit is contained in:
Yan Zhulanow
2020-03-10 18:43:02 +09:00
parent 19d1532dc7
commit 08f31758b8
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/quickfix/ChangeFunctionSignatureFix.kt
+6 -2
View File
@@ -60,14 +60,14 @@ abstract class ChangeFunctionSignatureFix(
protected fun getNewArgumentName(argument: ValueArgument, validator: Function1<String, Boolean>): String { protected fun getNewArgumentName(argument: ValueArgument, validator: Function1<String, Boolean>): String {
val expression = KtPsiUtil.deparenthesize(argument.getArgumentExpression()) val expression = KtPsiUtil.deparenthesize(argument.getArgumentExpression())
val argumentName = argument.getArgumentName()?.asName?.asString() val argumentName = argument.getArgumentName()?.asName?.asString()
?: (expression as? KtNameReferenceExpression)?.getReferencedName()?.takeIf { it != "it" && it != "field" } ?: (expression as? KtNameReferenceExpression)?.getReferencedName()?.takeIf { !isSpecialName(it) }
return when { return when {
argumentName != null -> KotlinNameSuggester.suggestNameByName(argumentName, validator) argumentName != null -> KotlinNameSuggester.suggestNameByName(argumentName, validator)
expression != null -> { expression != null -> {
val bindingContext = expression.analyze(BodyResolveMode.PARTIAL) val bindingContext = expression.analyze(BodyResolveMode.PARTIAL)
val expressionText = expression.text val expressionText = expression.text
if (expressionText == "it" || expressionText == "field") { if (isSpecialName(expressionText)) {
val type = expression.getType(bindingContext) val type = expression.getType(bindingContext)
if (type != null) { if (type != null) {
return KotlinNameSuggester.suggestNamesByType(type, validator, "param").first() return KotlinNameSuggester.suggestNamesByType(type, validator, "param").first()
@@ -79,6 +79,10 @@ abstract class ChangeFunctionSignatureFix(
} }
} }
private fun isSpecialName(name: String): Boolean {
return name == "it" || name == "field"
}
companion object : KotlinSingleIntentionActionFactoryWithDelegate<KtCallElement, CallableDescriptor>() { companion object : KotlinSingleIntentionActionFactoryWithDelegate<KtCallElement, CallableDescriptor>() {
override fun getElementOfInterest(diagnostic: Diagnostic): KtCallElement? = diagnostic.psiElement.getStrictParentOfType() override fun getElementOfInterest(diagnostic: Diagnostic): KtCallElement? = diagnostic.psiElement.getStrictParentOfType()