[FE] Add context receivers to scope
This commit is contained in:
committed by
TeamCityServer
parent
c5687e080d
commit
d923c95671
+1
-1
@@ -374,7 +374,7 @@ class LazyScriptDescriptor(
|
||||
outerScope,
|
||||
receiverClassDescriptor,
|
||||
true,
|
||||
receiverClassDescriptor.thisAsReceiverParameter,
|
||||
listOf(receiverClassDescriptor.thisAsReceiverParameter),
|
||||
LexicalScopeKind.CLASS_MEMBER_SCOPE
|
||||
).addImportingScope(
|
||||
AllUnderImportScope.create(receiverClassDescriptor, emptyList())
|
||||
|
||||
+2
-2
@@ -41,8 +41,8 @@ class ReplImplicitsExtensionsResolutionFilter(
|
||||
): Sequence<ScopeWithImplicitsExtensionsResolutionInfo> {
|
||||
val processedReceivers = mutableSetOf<String>()
|
||||
return scopes.map { scope ->
|
||||
val receiver = (scope as? LexicalScope)?.implicitReceiver?.value
|
||||
val keep = receiver?.let {
|
||||
val receivers = (scope as? LexicalScope)?.implicitReceivers?.map { it.value }
|
||||
val keep = receivers?.all {
|
||||
lock.read {
|
||||
when (val descriptorFqName = (it as? ImplicitClassReceiver)?.declarationDescriptor?.fqNameSafe?.asString()) {
|
||||
null -> true
|
||||
|
||||
Reference in New Issue
Block a user