[FE] Change resolution scheme

This commit is contained in:
Anastasiya Shadrina
2021-06-17 01:10:54 +07:00
committed by TeamCityServer
parent 1f6746dc74
commit 37495bcba0
39 changed files with 455 additions and 113 deletions
@@ -41,7 +41,8 @@ class ReplImplicitsExtensionsResolutionFilter(
): Sequence<ScopeWithImplicitsExtensionsResolutionInfo> {
val processedReceivers = mutableSetOf<String>()
return scopes.map { scope ->
val receivers = (scope as? LexicalScope)?.implicitReceivers?.map { it.value }
val receivers = (if (scope is LexicalScope) listOfNotNull(scope.implicitReceiver) + scope.contextReceiversGroup else null)
?.map { it.value }
val keep = receivers?.all {
lock.read {
when (val descriptorFqName = (it as? ImplicitClassReceiver)?.declarationDescriptor?.fqNameSafe?.asString()) {