From 4f4c25ca5e6d7bd688182825ad0344a70c29ca21 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Thu, 17 Sep 2020 17:03:24 +0300 Subject: [PATCH] KT-41346 Cleanup `DeserializedMemberScope` --- .../deserialization/descriptors/DeserializedMemberScope.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt index 10da71163ef..349f88c13a9 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt @@ -82,14 +82,14 @@ abstract class DeserializedMemberScope protected constructor( internal val classNames by c.storageManager.createLazyValue { classNames().toSet() } - private val classifierNamesLazy = c.storageManager.createNullableLazyValue { + private val classifierNamesLazy by c.storageManager.createNullableLazyValue { val nonDeclaredNames = getNonDeclaredClassifierNames() ?: return@createNullableLazyValue null this.classNames + typeAliasNames + nonDeclaredNames } override fun getFunctionNames() = functionNamesLazy override fun getVariableNames() = variableNamesLazy - override fun getClassifierNames(): Set? = classifierNamesLazy() + override fun getClassifierNames(): Set? = classifierNamesLazy override fun definitelyDoesNotContainName(name: Name): Boolean { return name !in functionNamesLazy && name !in variableNamesLazy && name !in classNames && name !in typeAliasNames