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

Minor rename in if-then utils

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-08-15 12:35:05 +03:00
parent 5b77def0e0
commit 1471fe08d7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt
+3 -3
View File
@@ -216,12 +216,12 @@ data class IfThenToSelectData(
hasImplicitReceiver() -> factory.createExpressionByPattern("$0?.$1", newReceiver!!, baseClause).insertSafeCalls( hasImplicitReceiver() -> factory.createExpressionByPattern("$0?.$1", newReceiver!!, baseClause).insertSafeCalls(
factory factory
) )
baseClause is KtCallExpression -> replacedBaseClause(baseClause, newReceiver!!, factory) baseClause is KtCallExpression -> replacedBaseClauseWithLet(baseClause, newReceiver!!, factory)
else -> error("Illegal state") else -> error("Illegal state")
} }
} }
hasImplicitReceiver() -> factory.createExpressionByPattern("this?.$0", baseClause).insertSafeCalls(factory) hasImplicitReceiver() -> factory.createExpressionByPattern("this?.$0", baseClause).insertSafeCalls(factory)
baseClause is KtCallExpression -> replacedBaseClause(baseClause, receiverExpression, factory) baseClause is KtCallExpression -> replacedBaseClauseWithLet(baseClause, receiverExpression, factory)
else -> baseClause.insertSafeCalls(factory) else -> baseClause.insertSafeCalls(factory)
} }
} }
@@ -231,7 +231,7 @@ data class IfThenToSelectData(
internal fun hasImplicitReceiver(): Boolean = getImplicitReceiver() != null internal fun hasImplicitReceiver(): Boolean = getImplicitReceiver() != null
private fun replacedBaseClause(baseClause: KtCallExpression, receiver: KtExpression, factory: KtPsiFactory): KtExpression { private fun replacedBaseClauseWithLet(baseClause: KtCallExpression, receiver: KtExpression, factory: KtPsiFactory): KtExpression {
val needExplicitParameter = baseClause.valueArguments.any { it.getArgumentExpression()?.text == "it" } val needExplicitParameter = baseClause.valueArguments.any { it.getArgumentExpression()?.text == "it" }
val parameterName = if (needExplicitParameter) { val parameterName = if (needExplicitParameter) {
val scope = baseClause.getResolutionScope() val scope = baseClause.getResolutionScope()