From 369824cd2eb61c4ba86fa28f4c547a7d6dccd09b Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 17 Oct 2013 18:17:41 +0400 Subject: [PATCH] Skipping error types when processing alternative signatures. --- .../resolve/java/kotlinSignature/TypeTransformingVisitor.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java index 913880a2e14..e25c868efd5 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java @@ -101,7 +101,11 @@ public class TypeTransformingVisitor extends JetVisitor { return visitCommonType(DescriptorUtils.getFQName(classDescriptor).toSafe().asString(), type); } + @NotNull private JetType visitCommonType(@NotNull String qualifiedName, @NotNull JetTypeElement type) { + if (originalType.isError()) { + return originalType; + } TypeConstructor originalTypeConstructor = originalType.getConstructor(); ClassifierDescriptor declarationDescriptor = originalTypeConstructor.getDeclarationDescriptor(); assert declarationDescriptor != null;