From 78a4b6fff6cf9b720a9d605ac6a9a750543bf3fc Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 23 Oct 2013 15:40:39 +0400 Subject: [PATCH] Error class descriptor must not fail an attempt to create a type with arguments from it --- .../jet/lang/types/error/ErrorClassDescriptor.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/error/ErrorClassDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/types/error/ErrorClassDescriptor.java index 115aa51ea0b..24d13601c08 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/error/ErrorClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/error/ErrorClassDescriptor.java @@ -22,10 +22,13 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.ConstructorDescriptorImpl; import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.TypeProjection; import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.Collections; +import java.util.List; import static org.jetbrains.jet.lang.types.ErrorUtils.*; @@ -56,4 +59,10 @@ public final class ErrorClassDescriptor extends ClassDescriptorImpl { public String toString() { return getName().asString(); } + + @NotNull + @Override + public JetScope getMemberScope(@NotNull List typeArguments) { + return createErrorScope("Error scope for class " + getName() + " with arguments: " + typeArguments); + } }