Avoid creating substitution instances for empty argument list

2017-07-21 17:27:19 +03:00
parent fbdcf45976
commit 4eb0f245a6
1 changed files with 6 additions and 1 deletions
@@ -28,7 +28,12 @@ object KotlinTypeFactory {
        val descriptor = constructor.declarationDescriptor
        return when (descriptor) {
            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)
            else -> throw IllegalStateException("Unsupported classifier: $descriptor for constructor: $constructor")
        }