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

Minor: cleanup ReplaceSingleLineLetIntention

Browse Source
This commit is contained in:
Dmitry Gridin
2019-06-17 18:22:55 +07:00
parent bb0ee8ca0a
commit ea76ea6fb8
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceSingleLineLetIntention.kt
+5 -9
View File
@@ -62,8 +62,7 @@ class ReplaceSingleLineLetIntention : SelfTargetingOffsetIndependentIntention<Kt
) { ) {
override fun applyTo(element: KtCallExpression, editor: Editor?) { override fun applyTo(element: KtCallExpression, editor: Editor?) {
val lambdaExpression = element.lambdaArguments.firstOrNull()?.getLambdaExpression() ?: return val lambdaExpression = element.lambdaArguments.firstOrNull()?.getLambdaExpression() ?: return
val bodyExpression = lambdaExpression.bodyExpression?.children?.singleOrNull() ?: return when (val bodyExpression = lambdaExpression.bodyExpression?.children?.singleOrNull() ?: return) {
when (bodyExpression) {
is KtDotQualifiedExpression -> bodyExpression.applyTo(element) is KtDotQualifiedExpression -> bodyExpression.applyTo(element)
is KtBinaryExpression -> bodyExpression.applyTo(element) is KtBinaryExpression -> bodyExpression.applyTo(element)
is KtCallExpression -> bodyExpression.applyTo(element, lambdaExpression.functionLiteral, editor) is KtCallExpression -> bodyExpression.applyTo(element, lambdaExpression.functionLiteral, editor)
@@ -73,8 +72,7 @@ class ReplaceSingleLineLetIntention : SelfTargetingOffsetIndependentIntention<Kt
private fun KtBinaryExpression.applyTo(element: KtCallExpression) { private fun KtBinaryExpression.applyTo(element: KtCallExpression) {
val left = left ?: return val left = left ?: return
val factory = KtPsiFactory(element.project) val factory = KtPsiFactory(element.project)
val parent = element.parent when (val parent = element.parent) {
when (parent) {
is KtQualifiedExpression -> { is KtQualifiedExpression -> {
val receiver = parent.receiverExpression val receiver = parent.receiverExpression
val newLeft = when (left) { val newLeft = when (left) {
@@ -96,8 +94,7 @@ class ReplaceSingleLineLetIntention : SelfTargetingOffsetIndependentIntention<Kt
} }
private fun KtDotQualifiedExpression.applyTo(element: KtCallExpression) { private fun KtDotQualifiedExpression.applyTo(element: KtCallExpression) {
val parent = element.parent when (val parent = element.parent) {
when (parent) {
is KtQualifiedExpression -> { is KtQualifiedExpression -> {
val factory = KtPsiFactory(element.project) val factory = KtPsiFactory(element.project)
val receiver = parent.receiverExpression val receiver = parent.receiverExpression
@@ -126,9 +123,8 @@ class ReplaceSingleLineLetIntention : SelfTargetingOffsetIndependentIntention<Kt
if (!element.isLetMethodCall()) return false if (!element.isLetMethodCall()) return false
val lambdaExpression = element.lambdaArguments.firstOrNull()?.getLambdaExpression() ?: return false val lambdaExpression = element.lambdaArguments.firstOrNull()?.getLambdaExpression() ?: return false
val parameterName = lambdaExpression.getParameterName() ?: return false val parameterName = lambdaExpression.getParameterName() ?: return false
val bodyExpression = lambdaExpression.bodyExpression?.children?.singleOrNull() ?: return false
return when (bodyExpression) { return when (val bodyExpression = lambdaExpression.bodyExpression?.children?.singleOrNull() ?: return false) {
is KtBinaryExpression -> is KtBinaryExpression ->
element.parent !is KtSafeQualifiedExpression && bodyExpression.isApplicable(parameterName) element.parent !is KtSafeQualifiedExpression && bodyExpression.isApplicable(parameterName)
is KtDotQualifiedExpression -> is KtDotQualifiedExpression ->
@@ -200,7 +196,7 @@ class ReplaceSingleLineLetIntention : SelfTargetingOffsetIndependentIntention<Kt
val context = analyze(BodyResolveMode.PARTIAL) val context = analyze(BodyResolveMode.PARTIAL)
val parameterDescriptor = context[BindingContext.FUNCTION, this]?.valueParameters?.singleOrNull() ?: return emptyList() val parameterDescriptor = context[BindingContext.FUNCTION, this]?.valueParameters?.singleOrNull() ?: return emptyList()
val variableDescriptorByName = if (parameterDescriptor is ValueParameterDescriptorImpl.WithDestructuringDeclaration) val variableDescriptorByName = if (parameterDescriptor is ValueParameterDescriptorImpl.WithDestructuringDeclaration)
parameterDescriptor.destructuringVariables.associate { it.name to it } parameterDescriptor.destructuringVariables.associateBy { it.name }
else else
mapOf(parameterDescriptor.name to parameterDescriptor) mapOf(parameterDescriptor.name to parameterDescriptor)