azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-41346 Cleanup DeserializedMemberScope

Browse Source
This commit is contained in:
Roman Golyshev
2020-09-17 17:03:24 +03:00
parent 622f71bd65
commit 4f4c25ca5e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
+2 -2
View File
@@ -82,14 +82,14 @@ abstract class DeserializedMemberScope protected constructor(
internal val classNames by c.storageManager.createLazyValue { classNames().toSet() } 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 val nonDeclaredNames = getNonDeclaredClassifierNames() ?: return@createNullableLazyValue null
this.classNames + typeAliasNames + nonDeclaredNames this.classNames + typeAliasNames + nonDeclaredNames
} }
override fun getFunctionNames() = functionNamesLazy override fun getFunctionNames() = functionNamesLazy
override fun getVariableNames() = variableNamesLazy override fun getVariableNames() = variableNamesLazy
override fun getClassifierNames(): Set<Name>? = classifierNamesLazy() override fun getClassifierNames(): Set<Name>? = classifierNamesLazy
override fun definitelyDoesNotContainName(name: Name): Boolean { override fun definitelyDoesNotContainName(name: Name): Boolean {
return name !in functionNamesLazy && name !in variableNamesLazy && name !in classNames && name !in typeAliasNames return name !in functionNamesLazy && name !in variableNamesLazy && name !in classNames && name !in typeAliasNames