From cfc2c0fb20caa55c744c06c3af5448e2ff3f084c Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 12 Feb 2020 21:20:04 +0200
Subject: [PATCH] Changes after rebasing on master

---
 idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt | 5 ++---
 .../src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt | 8 +++-----
 idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt       | 5 ++---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
index 4a60c0e541c..c35e44ee38a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
@@ -10,9 +10,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.search.LocalSearchScope
 import com.intellij.psi.search.SearchScope
 import com.intellij.psi.search.searches.ReferencesSearch
-import com.intellij.slicer.SliceUsage
 import com.intellij.usageView.UsageInfo
-import com.intellij.util.Processor
 import org.jetbrains.kotlin.asJava.namedUnwrappedElement
 import org.jetbrains.kotlin.builtins.functions.FunctionInvokeDescriptor
 import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
@@ -24,6 +22,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource
 import org.jetbrains.kotlin.descriptors.VariableDescriptorWithAccessors
 import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.*
+import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinValVar
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.toValVar
 import org.jetbrains.kotlin.idea.references.KtPropertyDelegationMethodsReference
@@ -47,7 +46,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions
 
 class InflowSlicer(
     element: KtExpression,
-    processor: Processor<SliceUsage>,
+    processor: SliceUsageProcessor,
     parentUsage: KotlinSliceUsage
 ) : Slicer(element, processor, parentUsage) {
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
index 4f520925ef0..ec540031c4f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
@@ -5,17 +5,15 @@
 
 package org.jetbrains.kotlin.idea.slicer
 
-import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector
-import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector.*
+import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector.Access
 import com.intellij.psi.PsiElement
 import com.intellij.psi.impl.light.LightMemberReference
-import com.intellij.slicer.SliceUsage
 import com.intellij.usageView.UsageInfo
-import com.intellij.util.Processor
 import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
 import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
 import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*
 import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.ReturnValueInstruction
+import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
 import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReadWriteAccessDetector
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
@@ -25,7 +23,7 @@ import org.jetbrains.kotlin.resolve.source.getPsi
 
 class OutflowSlicer(
     element: KtExpression,
-    processor: Processor<SliceUsage>,
+    processor: SliceUsageProcessor,
     parentUsage: KotlinSliceUsage
 ) : Slicer(element, processor, parentUsage) {
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt
index 6bd7f21e36d..6fa2db13662 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt
@@ -9,9 +9,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.search.SearchScope
 import com.intellij.slicer.JavaSliceUsage
-import com.intellij.slicer.SliceUsage
 import com.intellij.usageView.UsageInfo
-import com.intellij.util.Processor
 import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode
 import org.jetbrains.kotlin.cfg.pseudocode.containingDeclarationForPseudocode
 import org.jetbrains.kotlin.cfg.pseudocode.getContainingPseudocode
@@ -23,6 +21,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
 import org.jetbrains.kotlin.idea.core.getDeepestSuperDeclarations
 import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions
 import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions
+import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
 import org.jetbrains.kotlin.idea.findUsages.processAllExactUsages
 import org.jetbrains.kotlin.idea.findUsages.processAllUsages
 import org.jetbrains.kotlin.psi.*
@@ -33,7 +32,7 @@ import java.util.*
 
 abstract class Slicer(
     protected val element: KtExpression,
-    protected val processor: Processor<SliceUsage>,
+    protected val processor: SliceUsageProcessor,
     protected val parentUsage: KotlinSliceUsage
 ) {
     abstract fun processChildren()