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

"Remove redundant let" inspection: do not report for long call chains #KT-26289 Fixed

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-08-26 07:14:33 +09:00
committed by Mikhail Glukhikh
parent c6db26ba91
commit ae4ff45750
15 changed files with 141 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceSingleLineLetIntention.kt
+21 -1
View File
@@ -21,16 +21,36 @@ import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.core.replaced
import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
import org.jetbrains.kotlin.idea.intentions.branchedTransformations.lineCount
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.anyDescendantOfType
import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelector
import org.jetbrains.kotlin.psi.psiUtil.startOffset
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class ReplaceSingleLineLetInspection : IntentionBasedInspection<KtCallExpression>(ReplaceSingleLineLetIntention::class) {
class ReplaceSingleLineLetInspection : IntentionBasedInspection<KtCallExpression>(
ReplaceSingleLineLetIntention::class,
{ element -> isApplicable(element) }
) {
override fun inspectionTarget(element: KtCallExpression) = element.calleeExpression
companion object {
fun isApplicable(element: KtCallExpression): Boolean {
val qualifiedExpression = element.getQualifiedExpressionForSelector() ?: return true
var receiver = qualifiedExpression.receiverExpression as? KtQualifiedExpression ?: return true
if (receiver.lineCount() > 1) return false
var count = 1
while (true) {
if (count > 2) return false
receiver = receiver.receiverExpression as? KtQualifiedExpression ?: break
count++
}
return true
}
}
}
class ReplaceSingleLineLetIntention : SelfTargetingOffsetIndependentIntention<KtCallExpression>(