diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ArrayAccessReference.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ArrayAccessReference.kt
index ceb7fd3c8a2..4e3bfaf3d94 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ArrayAccessReference.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ArrayAccessReference.kt
@@ -9,6 +9,7 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode
 import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession
+import org.jetbrains.kotlin.analysis.api.descriptors.references.base.CliKtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
@@ -16,7 +17,7 @@ import org.jetbrains.kotlin.idea.references.KtArrayAccessReference
 import org.jetbrains.kotlin.psi.KtArrayAccessExpression
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 
-internal class KtFe10ArrayAccessReference(expression: KtArrayAccessExpression) : KtArrayAccessReference(expression), KtFe10Reference {
+abstract class KtFe10ArrayAccessReference(expression: KtArrayAccessExpression) : KtArrayAccessReference(expression), KtFe10Reference {
     override fun KtAnalysisSession.resolveToSymbols(): Collection<KtSymbol> {
         require(this is KtFe10AnalysisSession)
 
@@ -24,8 +25,10 @@ internal class KtFe10ArrayAccessReference(expression: KtArrayAccessExpression) :
         val descriptor = expression.getResolvedCall(bindingContext)?.resultingDescriptor
         return listOfNotNull(descriptor?.toKtCallableSymbol(this))
     }
+}
 
+class CliKtFe10ArrayAccessReference(expression: KtArrayAccessExpression) : KtFe10ArrayAccessReference(expression), CliKtFe10Reference {
     override fun handleElementRename(newElementName: String): PsiElement? {
-        TODO("Not yet implemented")
+        throw NotImplementedError("Renaming is not supported")
     }
 }
\ No newline at end of file
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10CollectionLiteralReference.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10CollectionLiteralReference.kt
index 3ff4525f52a..ea15af2586b 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10CollectionLiteralReference.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10CollectionLiteralReference.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.analysis.api.descriptors.references
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode
 import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession
+import org.jetbrains.kotlin.analysis.api.descriptors.references.base.CliKtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
@@ -15,7 +16,7 @@ import org.jetbrains.kotlin.idea.references.KtCollectionLiteralReference
 import org.jetbrains.kotlin.psi.KtCollectionLiteralExpression
 import org.jetbrains.kotlin.resolve.BindingContext
 
-internal class KtFe10CollectionLiteralReference(
+abstract class KtFe10CollectionLiteralReference(
     expression: KtCollectionLiteralExpression
 ) : KtCollectionLiteralReference(expression), KtFe10Reference {
     override fun KtAnalysisSession.resolveToSymbols(): Collection<KtSymbol> {
@@ -25,4 +26,8 @@ internal class KtFe10CollectionLiteralReference(
         val descriptor = bindingContext[BindingContext.COLLECTION_LITERAL_CALL, expression]?.resultingDescriptor
         return listOfNotNull(descriptor?.toKtCallableSymbol(this))
     }
-}
\ No newline at end of file
+}
+
+internal class CliKtFe10CollectionLiteralReference(
+    expression: KtCollectionLiteralExpression
+) : KtFe10CollectionLiteralReference(expression), CliKtFe10Reference
\ No newline at end of file
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ConstructorDelegationReference.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ConstructorDelegationReference.kt
index 6bd9598d3b2..3dae977f9f3 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ConstructorDelegationReference.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ConstructorDelegationReference.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.analysis.api.descriptors.references
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode
 import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession
+import org.jetbrains.kotlin.analysis.api.descriptors.references.base.CliKtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
@@ -15,7 +16,7 @@ import org.jetbrains.kotlin.idea.references.KtConstructorDelegationReference
 import org.jetbrains.kotlin.psi.KtConstructorDelegationReferenceExpression
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 
-internal class KtFe10ConstructorDelegationReference(
+abstract class KtFe10ConstructorDelegationReference(
     expression: KtConstructorDelegationReferenceExpression
 ) : KtConstructorDelegationReference(expression), KtFe10Reference {
     override fun KtAnalysisSession.resolveToSymbols(): Collection<KtSymbol> {
@@ -25,4 +26,8 @@ internal class KtFe10ConstructorDelegationReference(
         val descriptor = expression.getResolvedCall(bindingContext)?.resultingDescriptor
         return listOfNotNull(descriptor?.toKtCallableSymbol(this))
     }
-}
\ No newline at end of file
+}
+
+internal class CliKtFe10ConstructorDelegationReference(
+    expression: KtConstructorDelegationReferenceExpression
+) : KtFe10ConstructorDelegationReference(expression), CliKtFe10Reference
\ No newline at end of file
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10DestructuringDeclarationEntry.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10DestructuringDeclarationEntry.kt
index b4546fc1040..38dea7e53bc 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10DestructuringDeclarationEntry.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10DestructuringDeclarationEntry.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.analysis.api.descriptors.references
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode
 import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession
+import org.jetbrains.kotlin.analysis.api.descriptors.references.base.CliKtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
@@ -15,7 +16,7 @@ import org.jetbrains.kotlin.idea.references.KtDestructuringDeclarationReference
 import org.jetbrains.kotlin.psi.KtDestructuringDeclarationEntry
 import org.jetbrains.kotlin.resolve.BindingContext
 
-internal class KtFe10DestructuringDeclarationEntry(
+abstract class KtFe10DestructuringDeclarationEntry(
     element: KtDestructuringDeclarationEntry
 ) : KtDestructuringDeclarationReference(element), KtFe10Reference {
     override fun KtAnalysisSession.resolveToSymbols(): Collection<KtSymbol> {
@@ -25,8 +26,12 @@ internal class KtFe10DestructuringDeclarationEntry(
         val descriptor = bindingContext[BindingContext.COMPONENT_RESOLVED_CALL, element]?.resultingDescriptor
         return listOfNotNull(descriptor?.toKtCallableSymbol(this))
     }
+}
 
+internal class CliKtFe10DestructuringDeclarationEntry(
+    element: KtDestructuringDeclarationEntry
+) : KtFe10DestructuringDeclarationEntry(element), CliKtFe10Reference {
     override fun canRename(): Boolean {
-        return false // TODO
+        return false
     }
 }
\ No newline at end of file
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ForLoopInReference.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ForLoopInReference.kt
index 51a404ec6c9..a98a141799d 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ForLoopInReference.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ForLoopInReference.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.analysis.api.descriptors.references
 
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession
+import org.jetbrains.kotlin.analysis.api.descriptors.references.base.CliKtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
@@ -14,7 +15,7 @@ import org.jetbrains.kotlin.idea.references.KtForLoopInReference
 import org.jetbrains.kotlin.psi.KtForExpression
 import org.jetbrains.kotlin.resolve.BindingContext
 
-internal class KtFe10ForLoopInReference(element: KtForExpression) : KtForLoopInReference(element), KtFe10Reference {
+abstract class KtFe10ForLoopInReference(expression: KtForExpression) : KtForLoopInReference(expression), KtFe10Reference {
     override fun KtAnalysisSession.resolveToSymbols(): Collection<KtSymbol> {
         check(this is KtFe10AnalysisSession)
 
@@ -27,4 +28,6 @@ internal class KtFe10ForLoopInReference(element: KtForExpression) : KtForLoopInR
             BindingContext.LOOP_RANGE_NEXT_RESOLVED_CALL
         ).mapNotNull { slice -> bindingContext[slice, loopRange]?.resultingDescriptor?.toKtCallableSymbol(this) }
     }
-}
\ No newline at end of file
+}
+
+internal class CliKtFe10ForLoopInReference(expression: KtForExpression) : KtFe10ForLoopInReference(expression), CliKtFe10Reference
\ No newline at end of file
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10InvokeFunctionReference.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10InvokeFunctionReference.kt
index 4098643bd04..721e1fe49f9 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10InvokeFunctionReference.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10InvokeFunctionReference.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.analysis.api.descriptors.references
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode
 import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession
+import org.jetbrains.kotlin.analysis.api.descriptors.references.base.CliKtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
@@ -16,7 +17,7 @@ import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 
-internal class KtFe10InvokeFunctionReference(expression: KtCallExpression) : KtInvokeFunctionReference(expression), KtFe10Reference {
+abstract class KtFe10InvokeFunctionReference(expression: KtCallExpression) : KtInvokeFunctionReference(expression), KtFe10Reference {
     override fun KtAnalysisSession.resolveToSymbols(): Collection<KtSymbol> {
         require(this is KtFe10AnalysisSession)
 
@@ -24,8 +25,12 @@ internal class KtFe10InvokeFunctionReference(expression: KtCallExpression) : KtI
         val descriptor = expression.getResolvedCall(bindingContext)?.resultingDescriptor
         return listOfNotNull(descriptor?.toKtCallableSymbol(this))
     }
+}
 
+internal class CliKtFe10InvokeFunctionReference(
+    expression: KtCallExpression
+) : KtFe10InvokeFunctionReference(expression), CliKtFe10Reference {
     override fun doRenameImplicitConventionalCall(newName: String?): KtExpression {
-        TODO("Not yet implemented")
+        throw NotImplementedError("Renaming is not supported")
     }
 }
\ No newline at end of file
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10PropertyDelegationMethodsReference.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10PropertyDelegationMethodsReference.kt
index 03a71361bf7..1d7b0391f14 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10PropertyDelegationMethodsReference.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10PropertyDelegationMethodsReference.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.analysis.api.descriptors.references
 
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession
+import org.jetbrains.kotlin.analysis.api.descriptors.references.base.CliKtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
@@ -16,9 +17,9 @@ import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.psi.KtPropertyDelegate
 import org.jetbrains.kotlin.resolve.BindingContext
 
-internal class KtFe10PropertyDelegationMethodsReference(
-    element: KtPropertyDelegate
-) : KtPropertyDelegationMethodsReference(element), KtFe10Reference {
+abstract class KtFe10PropertyDelegationMethodsReference(
+    expression: KtPropertyDelegate
+) : KtPropertyDelegationMethodsReference(expression), KtFe10Reference {
     override fun KtAnalysisSession.resolveToSymbols(): Collection<KtSymbol> {
         require(this is KtFe10AnalysisSession)
 
@@ -40,4 +41,8 @@ internal class KtFe10PropertyDelegationMethodsReference(
 
         return emptyList()
     }
-}
\ No newline at end of file
+}
+
+internal class CliKtFe10PropertyDelegationMethodsReference(
+    expression: KtPropertyDelegate
+) : KtFe10PropertyDelegationMethodsReference(expression), CliKtFe10Reference
\ No newline at end of file
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10SimpleNameReference.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10SimpleNameReference.kt
index f0e7e7d1f2c..c161700da3d 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10SimpleNameReference.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10SimpleNameReference.kt
@@ -9,6 +9,7 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode
 import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession
+import org.jetbrains.kotlin.analysis.api.descriptors.references.base.CliKtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
@@ -19,7 +20,7 @@ import org.jetbrains.kotlin.psi.KtSimpleNameExpression
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 
-internal class KtFe10SimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleNameReference(expression), KtFe10Reference {
+abstract class KtFe10SimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleNameReference(expression), KtFe10Reference {
     override fun KtAnalysisSession.resolveToSymbols(): Collection<KtSymbol> {
         require(this is KtFe10AnalysisSession)
 
@@ -30,28 +31,32 @@ internal class KtFe10SimpleNameReference(expression: KtSimpleNameExpression) : K
 
         return listOfNotNull(descriptor?.toKtSymbol(this))
     }
+}
 
+internal class CliKtFe10SimpleNameReference(
+    expression: KtSimpleNameExpression
+) : KtFe10SimpleNameReference(expression), CliKtFe10Reference {
     override fun doCanBeReferenceTo(candidateTarget: PsiElement): Boolean {
-        return true // TODO
+        return true
     }
 
     override fun isReferenceTo(element: PsiElement): Boolean {
-        return resolve() == element // TODO
+        return resolve() == element
     }
 
     override fun handleElementRename(newElementName: String): PsiElement? {
-        TODO("Not yet implemented")
+        throw NotImplementedError("Renaming is not supported")
     }
 
     override fun bindToElement(element: PsiElement, shorteningMode: ShorteningMode): PsiElement {
-        TODO("Not yet implemented")
+        throw NotImplementedError("Binding is not supported")
     }
 
     override fun bindToFqName(fqName: FqName, shorteningMode: ShorteningMode, targetElement: PsiElement?): PsiElement {
-        TODO("Not yet implemented")
+        throw NotImplementedError("Binding is not supported")
     }
 
     override fun getImportAlias(): KtImportAlias? {
-        TODO("Not yet implemented")
+        return null
     }
 }
\ No newline at end of file
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10KotlinReferenceProviderContributor.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10KotlinReferenceProviderContributor.kt
index e5f5175a1f5..9a584c6b458 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10KotlinReferenceProviderContributor.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10KotlinReferenceProviderContributor.kt
@@ -12,14 +12,14 @@ import org.jetbrains.kotlin.idea.references.KotlinReferenceProviderContributor
 class KtFe10KotlinReferenceProviderContributor : KotlinReferenceProviderContributor {
     override fun registerReferenceProviders(registrar: KotlinPsiReferenceRegistrar) {
         with(registrar) {
-            registerProvider(factory = ::KtFe10SimpleNameReference)
-            registerProvider(factory = ::KtFe10ForLoopInReference)
-            registerProvider(factory = ::KtFe10InvokeFunctionReference)
-            registerProvider(factory = ::KtFe10PropertyDelegationMethodsReference)
-            registerProvider(factory = ::KtFe10DestructuringDeclarationEntry)
-            registerProvider(factory = ::KtFe10ArrayAccessReference)
-            registerProvider(factory = ::KtFe10ConstructorDelegationReference)
-            registerProvider(factory = ::KtFe10CollectionLiteralReference)
+            registerProvider(factory = ::CliKtFe10SimpleNameReference)
+            registerProvider(factory = ::CliKtFe10ForLoopInReference)
+            registerProvider(factory = ::CliKtFe10InvokeFunctionReference)
+            registerProvider(factory = ::CliKtFe10PropertyDelegationMethodsReference)
+            registerProvider(factory = ::CliKtFe10DestructuringDeclarationEntry)
+            registerProvider(factory = ::CliKtFe10ArrayAccessReference)
+            registerProvider(factory = ::CliKtFe10ConstructorDelegationReference)
+            registerProvider(factory = ::CliKtFe10CollectionLiteralReference)
         }
     }
 }
\ No newline at end of file
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10PolyVariantResolver.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10PolyVariantResolver.kt
index 07186cfa735..49548ff2891 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10PolyVariantResolver.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10PolyVariantResolver.kt
@@ -21,6 +21,11 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.jetbrains.kotlin.resolve.source.getPsi
 
+internal interface CliKtFe10Reference : KtReference {
+    override val resolver: ResolveCache.PolyVariantResolver<KtReference>
+        get() = KtFe10PolyVariantResolver
+}
+
 object KtFe10PolyVariantResolver : ResolveCache.PolyVariantResolver<KtReference> {
     @OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
     override fun resolve(reference: KtReference, incompleteCode: Boolean): Array<ResolveResult> {
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10Reference.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10Reference.kt
index 12e3777557d..34cf9986bf6 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10Reference.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10Reference.kt
@@ -5,11 +5,7 @@
 
 package org.jetbrains.kotlin.analysis.api.descriptors.references.base
 
-import com.intellij.psi.impl.source.resolve.ResolveCache
 import org.jetbrains.kotlin.analysis.api.KtSymbolBasedReference
 import org.jetbrains.kotlin.idea.references.KtReference
 
-interface KtFe10Reference : KtReference, KtSymbolBasedReference {
-    override val resolver: ResolveCache.PolyVariantResolver<KtReference>
-        get() = KtFe10PolyVariantResolver
-}
\ No newline at end of file
+interface KtFe10Reference : KtReference, KtSymbolBasedReference
\ No newline at end of file