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

Avoid creating substitution instances for empty argument list

Browse Source
This commit is contained in:
Denis Zharkov
2017-07-21 17:27:19 +03:00
parent fbdcf45976
commit 4eb0f245a6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/types/KotlinTypeFactory.kt
+6 -1
View File
@@ -28,7 +28,12 @@ object KotlinTypeFactory {
val descriptor = constructor.declarationDescriptor val descriptor = constructor.declarationDescriptor
return when (descriptor) { return when (descriptor) {
is TypeParameterDescriptor -> descriptor.getDefaultType().memberScope is TypeParameterDescriptor -> descriptor.getDefaultType().memberScope
is ClassDescriptor -> descriptor.getMemberScope(TypeConstructorSubstitution.create(constructor, arguments)) is ClassDescriptor -> {
if (arguments.isEmpty())
descriptor.defaultType.memberScope
else
descriptor.getMemberScope(TypeConstructorSubstitution.create(constructor, arguments))
}
is TypeAliasDescriptor -> ErrorUtils.createErrorScope("Scope for abbreviation: ${descriptor.name}", true) is TypeAliasDescriptor -> ErrorUtils.createErrorScope("Scope for abbreviation: ${descriptor.name}", true)
else -> throw IllegalStateException("Unsupported classifier: $descriptor for constructor: $constructor") else -> throw IllegalStateException("Unsupported classifier: $descriptor for constructor: $constructor")
} }