From 5888c75d41f9d8c2ce492f7ddac8e18023c6a2af Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 3 Feb 2017 12:24:56 +0300 Subject: [PATCH] Minor. Refine implicit receiver for destructuring scope Actually it should not be very important, but for sake of consistency we should use null receiver even if we have one in an outer scope This is a post-review fix --- .../src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt index 256c46e6148..157c3357983 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt @@ -204,7 +204,7 @@ fun LexicalScope.replaceImportingScopes(importingScopeChain: ImportingScope?): L fun LexicalScope.createScopeForDestructuring(newReceiver: ReceiverParameterDescriptor?): LexicalScope { return LexicalScopeImpl( parent, ownerDescriptor, isOwnerDescriptorAccessibleByLabel, - newReceiver ?: implicitReceiver, + newReceiver, LexicalScopeKind.FUNCTION_HEADER_FOR_DESTRUCTURING ) }