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

"Convert to 'also'" intention: Fix for call expression has this receiver #KT-26009 Fixed

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-08-16 11:21:34 +09:00
committed by asedunov
parent e1dd85429f
commit be30761ec4
4 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/ScopeFunctionConversionInspection.kt
+4 -2
View File
@@ -209,8 +209,10 @@ class ConvertScopeFunctionToParameter(counterpartName: String) : ConvertScopeFun
if (dispatchReceiverTarget == lambdaDescriptor || extensionReceiverTarget == lambdaDescriptor) {
val parent = expression.parent
if (parent is KtCallExpression && expression == parent.calleeExpression) {
replacements.add(parent) { element ->
factory.createExpressionByPattern("$0.$1", parameterName, element)
if ((parent.parent as? KtQualifiedExpression)?.receiverExpression !is KtThisExpression) {
replacements.add(parent) { element ->
factory.createExpressionByPattern("$0.$1", parameterName, element)
}
}
} else if (parent is KtQualifiedExpression && parent.receiverExpression is KtThisExpression) {
// do nothing