From 30304ed1b19bd71c6866e408e0f54c6659a4d918 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <abreslav@abreslav-mac.labs.intellij.net>
Date: Fri, 2 Sep 2011 17:02:31 +0400
Subject: [PATCH] Error types are not imported as supertypes for member
 resolution

class C(x : Int) : Base(x /*parameter*/), Base1 by Base1(x) {
    val xx : Int // <- this Int used to be resolved to ERROR_CLASS
}
---
 .../jet/lang/descriptors/MutableClassDescriptor.java          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java
index 7686e45aad8..68065c8535e 100644
--- a/idea/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java
+++ b/idea/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java
@@ -120,7 +120,9 @@ public class MutableClassDescriptor extends MutableDeclarationDescriptor impleme
     }
 
     public void addSupertype(@NotNull JetType supertype) {
-        scopeForMemberLookup.importScope(supertype.getMemberScope());
+        if (!ErrorUtils.isErrorType(supertype)) {
+            scopeForMemberLookup.importScope(supertype.getMemberScope());
+        }
         supertypes.add(supertype);
     }