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

replacedBaseClauseWithLet: rename & convert parameter to receiver

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-09-07 15:13:21 +03:00
parent 9ab8f3d7b5
commit 9bc874f647
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt
+10 -7
View File
@@ -224,12 +224,12 @@ data class IfThenToSelectData(
hasImplicitReceiverReplaceableBySafeCall() -> factory.createExpressionByPattern("$0?.$1", newReceiver!!, baseClause).insertSafeCalls( hasImplicitReceiverReplaceableBySafeCall() -> factory.createExpressionByPattern("$0?.$1", newReceiver!!, baseClause).insertSafeCalls(
factory factory
) )
baseClause is KtCallExpression -> replacedBaseClauseWithLet(baseClause, newReceiver!!, factory) baseClause is KtCallExpression -> baseClause.replaceCallWithLet(newReceiver!!, factory)
else -> error("Illegal state") else -> error("Illegal state")
} }
} }
hasImplicitReceiverReplaceableBySafeCall() -> factory.createExpressionByPattern("this?.$0", baseClause).insertSafeCalls(factory) hasImplicitReceiverReplaceableBySafeCall() -> factory.createExpressionByPattern("this?.$0", baseClause).insertSafeCalls(factory)
baseClause is KtCallExpression -> replacedBaseClauseWithLet(baseClause, receiverExpression, factory) baseClause is KtCallExpression -> baseClause.replaceCallWithLet(receiverExpression, factory)
else -> baseClause.insertSafeCalls(factory) else -> baseClause.insertSafeCalls(factory)
} }
} }
@@ -244,10 +244,13 @@ data class IfThenToSelectData(
internal fun hasImplicitReceiverReplaceableBySafeCall(): Boolean = internal fun hasImplicitReceiverReplaceableBySafeCall(): Boolean =
receiverExpression is KtThisExpression && getImplicitReceiver() != null receiverExpression is KtThisExpression && getImplicitReceiver() != null
private fun replacedBaseClauseWithLet(baseClause: KtCallExpression, receiver: KtExpression, factory: KtPsiFactory): KtExpression { private fun KtCallExpression.replaceCallWithLet(
val needExplicitParameter = baseClause.valueArguments.any { it.getArgumentExpression()?.text == "it" } receiver: KtExpression,
factory: KtPsiFactory
): KtExpression {
val needExplicitParameter = valueArguments.any { it.getArgumentExpression()?.text == "it" }
val parameterName = if (needExplicitParameter) { val parameterName = if (needExplicitParameter) {
val scope = baseClause.getResolutionScope() val scope = getResolutionScope()
KotlinNameSuggester.suggestNameByName("it") { scope.findVariable(Name.identifier(it), NoLookupLocation.FROM_IDE) == null } KotlinNameSuggester.suggestNameByName("it") { scope.findVariable(Name.identifier(it), NoLookupLocation.FROM_IDE) == null }
} else { } else {
"it" "it"
@@ -256,9 +259,9 @@ data class IfThenToSelectData(
appendExpression(receiver) appendExpression(receiver)
appendFixedText("?.let {") appendFixedText("?.let {")
if (needExplicitParameter) appendFixedText(" $parameterName ->") if (needExplicitParameter) appendFixedText(" $parameterName ->")
appendExpression(baseClause.calleeExpression) appendExpression(calleeExpression)
appendFixedText("(") appendFixedText("(")
baseClause.valueArguments.forEachIndexed { index, arg -> valueArguments.forEachIndexed { index, arg ->
if (index != 0) appendFixedText(", ") if (index != 0) appendFixedText(", ")
val argExpression = arg.getArgumentExpression() val argExpression = arg.getArgumentExpression()
if (argExpression?.evaluatesTo(receiverExpression) == true) if (argExpression?.evaluatesTo(receiverExpression) == true)