From 573c60ed6b9e0632cd2b855d9acd507b1c1efc0c Mon Sep 17 00:00:00 2001 From: Ilya Muradyan Date: Wed, 17 Jun 2020 15:33:39 +0300 Subject: [PATCH] Add missing recordLookup implementations --- .../kotlin/resolve/scopes/LexicalChainedScope.kt | 8 ++++++++ .../kotlin/resolve/scopes/InnerClassesScopeWrapper.kt | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt index a65ef7acc9e..e338fb3631c 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt @@ -91,6 +91,14 @@ class LexicalChainedScope private constructor( p.println("}") } + override fun definitelyDoesNotContainName(name: Name): Boolean { + return memberScopes.all { it.definitelyDoesNotContainName(name) } + } + + override fun recordLookup(name: Name, location: LookupLocation) { + memberScopes.forEach { it.recordLookup(name, location) } + } + companion object { @JvmOverloads diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt index 10f0011be3d..93851fdcb83 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt @@ -46,5 +46,9 @@ class InnerClassesScopeWrapper(val workerScope: MemberScope) : MemberScopeImpl() override fun definitelyDoesNotContainName(name: Name) = workerScope.definitelyDoesNotContainName(name) + override fun recordLookup(name: Name, location: LookupLocation) { + workerScope.recordLookup(name, location) + } + override fun toString() = "Classes from $workerScope" }