diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt index a1d1749ae1c..04ed30adae4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt @@ -35,9 +35,7 @@ public trait WritableScope : JetScope { public fun addFunctionDescriptor(functionDescriptor: FunctionDescriptor) - public fun addClassifierDescriptor(classDescriptor: ClassifierDescriptor) - - public fun addClassifierAlias(name: Name, classifierDescriptor: ClassifierDescriptor) + public fun addClassifierDescriptor(classifierDescriptor: ClassifierDescriptor) public fun importScope(imported: JetScope) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt index 60f6185b5c8..5c58dcb00f1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt @@ -193,15 +193,10 @@ public class WritableScopeImpl(scope: JetScope, return result } - override fun addClassifierDescriptor(classDescriptor: ClassifierDescriptor) { - checkMayWrite() - - addClassifierAlias(classDescriptor.getName(), classDescriptor) - } - - override fun addClassifierAlias(name: Name, classifierDescriptor: ClassifierDescriptor) { + override fun addClassifierDescriptor(classifierDescriptor: ClassifierDescriptor) { checkMayWrite() + val name = classifierDescriptor.getName() checkForRedeclaration(name, classifierDescriptor) getVariableOrClassDescriptors().put(name, classifierDescriptor) explicitlyAddedDescriptors.add(classifierDescriptor) diff --git a/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java index 8b88bb0b16a..148fde19803 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; import org.jetbrains.kotlin.descriptors.impl.ReceiverParameterDescriptorImpl; import org.jetbrains.kotlin.di.InjectorForTests; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.ImportPath; @@ -614,8 +615,9 @@ public class JetTypeCheckerTest extends JetLiteFixture { writableScope.importScope(module.getPackage(fqName).getMemberScope()); } else { - writableScope.addClassifierAlias(defaultImport.getImportedName(), - module.getPackage(fqName.parent()).getMemberScope().getClassifier(fqName.shortName())); + Name shortName = fqName.shortName(); + assert shortName.equals(defaultImport.getImportedName()); + writableScope.addClassifierDescriptor(module.getPackage(fqName.parent()).getMemberScope().getClassifier(shortName)); } } writableScope.importScope(module.getPackage(FqName.ROOT).getMemberScope());