Convert reference to lambda: reformat
This commit is contained in:
@@ -55,9 +55,11 @@ class ConvertReferenceToLambdaIntention : SelfTargetingOffsetIndependentIntentio
|
|||||||
val receiverType = receiverExpression?.let {
|
val receiverType = receiverExpression?.let {
|
||||||
(context[DOUBLE_COLON_LHS, it] as? DoubleColonLHS.Type)?.type
|
(context[DOUBLE_COLON_LHS, it] as? DoubleColonLHS.Type)?.type
|
||||||
}
|
}
|
||||||
val receiverNameAndType = receiverType?.let { KotlinNameSuggester.suggestNamesByType(it, validator = {
|
val receiverNameAndType = receiverType?.let {
|
||||||
name -> name !in parameterNamesAndTypes.map { it.first }
|
KotlinNameSuggester.suggestNamesByType(it, validator = { name ->
|
||||||
}, defaultName = "receiver").first() to it }
|
name !in parameterNamesAndTypes.map { it.first }
|
||||||
|
}, defaultName = "receiver").first() to it
|
||||||
|
}
|
||||||
|
|
||||||
val valueArgumentParent = element.parent as? KtValueArgument
|
val valueArgumentParent = element.parent as? KtValueArgument
|
||||||
val callGrandParent = valueArgumentParent?.parent?.parent as? KtCallExpression
|
val callGrandParent = valueArgumentParent?.parent?.parent as? KtCallExpression
|
||||||
@@ -94,8 +96,7 @@ class ConvertReferenceToLambdaIntention : SelfTargetingOffsetIndependentIntentio
|
|||||||
"$receiverPrefix$targetName(it)"
|
"$receiverPrefix$targetName(it)"
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
factory.createLambdaExpression(
|
factory.createLambdaExpression(
|
||||||
parameters = lambdaParameterNamesAndTypes.joinToString(separator = ", ") {
|
parameters = lambdaParameterNamesAndTypes.joinToString(separator = ", ") {
|
||||||
if (valueArgumentParent != null) it.first
|
if (valueArgumentParent != null) it.first
|
||||||
@@ -103,8 +104,7 @@ class ConvertReferenceToLambdaIntention : SelfTargetingOffsetIndependentIntentio
|
|||||||
},
|
},
|
||||||
body = if (targetDescriptor is PropertyDescriptor) {
|
body = if (targetDescriptor is PropertyDescriptor) {
|
||||||
"$receiverPrefix$targetName"
|
"$receiverPrefix$targetName"
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
parameterNamesAndTypes.joinToString(
|
parameterNamesAndTypes.joinToString(
|
||||||
prefix = "$receiverPrefix$targetName(",
|
prefix = "$receiverPrefix$targetName(",
|
||||||
separator = ", ",
|
separator = ", ",
|
||||||
|
|||||||
Reference in New Issue
Block a user