From c8a9b5f67a47db345a9a8eed443511a5a8938bb6 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Thu, 29 Jun 2017 16:19:53 +0300
Subject: [PATCH] Restrict range of "simplifiable call chain" inspection

---
 .../collections/SimplifiableCallChainInspection.kt        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/collections/SimplifiableCallChainInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/collections/SimplifiableCallChainInspection.kt
index 9dd893654b7..b78a809e761 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/collections/SimplifiableCallChainInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/collections/SimplifiableCallChainInspection.kt
@@ -18,12 +18,10 @@ package org.jetbrains.kotlin.idea.inspections.collections
 
 import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.inspections.AbstractKotlinInspection
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.anyDescendantOfType
-import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument
@@ -43,8 +41,10 @@ class SimplifiableCallChainInspection : AbstractKotlinInspection() {
                     val firstCallExpression = firstQualifiedExpression.selectorExpression as? KtCallExpression ?: return
                     val secondCallExpression = expression.selectorExpression as? KtCallExpression ?: return
 
+                    val firstCalleeExpression = firstCallExpression.calleeExpression ?: return
+                    val secondCalleeExpression = secondCallExpression.calleeExpression ?: return
                     val actualConversions = conversionGroups[
-                            firstCallExpression.calleeExpression?.text to secondCallExpression.calleeExpression?.text
+                            firstCalleeExpression.text to secondCalleeExpression.text
                             ] ?: return
 
                     val context = expression.analyze()
@@ -78,7 +78,7 @@ class SimplifiableCallChainInspection : AbstractKotlinInspection() {
 
                     val descriptor = holder.manager.createProblemDescriptor(
                             expression,
-                            TextRange(firstCallExpression.startOffset, firstCallExpression.endOffset).shiftRight(-expression.startOffset),
+                            firstCalleeExpression.textRange.shiftRight(-expression.startOffset),
                             "Call chain on collection type may be simplified",
                             ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
                             isOnTheFly,