From a3be68de82eac0b6791c8ae7506f37cc446f052f Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 22 Jun 2018 15:29:11 +0300
Subject: [PATCH] Useless call: move class up from companion to remove 1.3
 deprecation

---
 .../inspections/collections/AbstractUselessCallInspection.kt   | 3 +--
 .../collections/UselessCallOnCollectionInspection.kt           | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/collections/AbstractUselessCallInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/collections/AbstractUselessCallInspection.kt
index c1756bd7a30..fc4770f2b5d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/collections/AbstractUselessCallInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/collections/AbstractUselessCallInspection.kt
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.psi.KtVisitorVoid
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull
-import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
 abstract class AbstractUselessCallInspection : AbstractKotlinInspection() {
 
@@ -58,9 +57,9 @@ abstract class AbstractUselessCallInspection : AbstractKotlinInspection() {
 
     override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) = QualifiedExpressionVisitor(holder, isOnTheFly)
 
+    protected data class Conversion(val replacementName: String? = null)
 
     protected companion object {
-        data class Conversion(val replacementName: String? = null)
 
         val deleteConversion = Conversion()
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/collections/UselessCallOnCollectionInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/collections/UselessCallOnCollectionInspection.kt
index 1b7aac55fe3..6155955dd3b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/collections/UselessCallOnCollectionInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/collections/UselessCallOnCollectionInspection.kt
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.inspections.collections
 
 import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.inspections.collections.AbstractUselessCallInspection.Companion.Conversion
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.psi.KtQualifiedExpression
 import org.jetbrains.kotlin.psi.psiUtil.endOffset