Minor. remove usage of WritableScopeImpl

This commit is contained in:
Stanislav Erokhin
2015-10-31 05:36:28 +03:00
parent c1fa973324
commit e0bacb2680
@@ -348,24 +348,14 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
assert (receiverClassDescriptor is JavaClassDescriptor) { "Unexpected receiver class: $receiverClassDescriptor" }
val typeParamScope = with(
WritableScopeImpl(
KtScope.Empty,
receiverClassDescriptor,
RedeclarationHandler.DO_NOTHING,
"Scope with type parameters for ${receiverClassDescriptor.getName()}"
)
) {
receiverClassDescriptor.getTypeConstructor().getParameters().forEach { addClassifierDescriptor(it) }
changeLockLevel(LexicalWritableScope.LockLevel.READING)
this
}
val projections = receiverClassDescriptor.getTypeConstructor().getParameters()
.map { TypeProjectionImpl(it.getDefaultType()) }
val memberScope = receiverClassDescriptor.getMemberScope(projections)
return typeParamScope.memberScopeAsImportingScope(memberScope.memberScopeAsImportingScope())
return LexicalScopeImpl(memberScope.memberScopeAsImportingScope(), receiverClassDescriptor, false, null,
"Scope with type parameters for ${receiverClassDescriptor.getName()}") {
receiverClassDescriptor.typeConstructor.parameters.forEach { addClassifierDescriptor(it) }
}
}
private fun collectSubstitutionsForReceiverTypeParameters(