diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt index e642d2d157b..83f47863ba1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt @@ -44,7 +44,6 @@ import org.jetbrains.kotlin.storage.getValue import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner import org.jetbrains.kotlin.types.refinement.TypeRefinement -import org.jetbrains.kotlin.utils.addToStdlib.flatMapToNullable import java.util.* open class LazyClassMemberScope( @@ -116,7 +115,6 @@ open class LazyClassMemberScope( by lazy(LazyThreadSafetyMode.PUBLICATION) { mutableSetOf().apply { addAll(declarationProvider.getDeclarationNames()) - addAll(c.syntheticResolveExtension.getSyntheticFunctionNames(thisDescriptor)) supertypes.flatMapTo(this) { it.memberScope.getFunctionNames() } @@ -125,32 +123,6 @@ open class LazyClassMemberScope( } } - private val _classifierNames: Set? - by lazy(LazyThreadSafetyMode.PUBLICATION) { - mutableSetOf().apply { - supertypes.flatMapToNullable(this) { - it.memberScope.getClassifierNames() - } ?: return@lazy null - - addAll(declarationProvider.getDeclarationNames()) - with(c.syntheticResolveExtension) { - getSyntheticCompanionObjectNameIfNeeded(thisDescriptor)?.let { add(it) } - addAll(getSyntheticNestedClassNames(thisDescriptor)) - } - } - } - - private val _allNames: Set? - by lazy(LazyThreadSafetyMode.PUBLICATION) { - val classifiers = getClassifierNames() ?: return@lazy null - - mutableSetOf().apply { - addAll(getVariableNames()) - addAll(getFunctionNames()) - addAll(classifiers) - } - } - private fun getDataClassRelatedFunctionNames(): Collection { val declarations = mutableListOf() addDataClassMethods(declarations, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS) @@ -159,11 +131,6 @@ open class LazyClassMemberScope( override fun getVariableNames() = _variableNames override fun getFunctionNames() = _functionNames - override fun getClassifierNames() = _classifierNames - - override fun definitelyDoesNotContainName(name: Name): Boolean { - return _allNames?.let { name !in it } ?: false - } private interface MemberExtractor { fun extract(extractFrom: KotlinType, name: Name): Collection 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 983f0d01f9b..a65ef7acc9e 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt @@ -91,10 +91,6 @@ class LexicalChainedScope private constructor( p.println("}") } - override fun definitelyDoesNotContainName(name: Name): Boolean { - return memberScopes.all { it.definitelyDoesNotContainName(name) } - } - companion object { @JvmOverloads diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScope.kt index bd8224e80ed..59a3c6f9eff 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScope.kt @@ -46,8 +46,6 @@ interface MemberScope : ResolutionScope { p.println("Empty member scope") } - override fun definitelyDoesNotContainName(name: Name): Boolean = true - override fun getFunctionNames() = emptySet() override fun getVariableNames() = emptySet() override fun getClassifierNames() = emptySet()