From 837cf38e915dba2c1009c65393e71db9c59605b7 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 20 Nov 2012 14:36:35 +0400 Subject: [PATCH] Temporarily disabled assert in SignaturesPropagation which fails due to bug in IDEA. --- .../kotlinSignature/SignaturesPropagation.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java index a34ff08252b..a02abb43001 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java @@ -26,9 +26,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.java.CollectionClassMapping; -import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMap; import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper; -import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedure; @@ -64,11 +62,15 @@ public class SignaturesPropagation { superFunctions.add(((FunctionDescriptor) superFun)); } else { + // TODO assert is temporarily disabled + // It fails because of bug in IDEA on Mac: it adds invalid roots to JDK classpath and it leads to the problem that + // getHierarchicalMethodSignature() returns elements from invalid virtual files + // Function descriptor can't be find iff superclass is java.lang.Collection or similar (translated to jet.* collections) - assert !JavaToKotlinClassMap.getInstance().mapPlatformClass( - new FqName(superSignature.getMethod().getContainingClass().getQualifiedName())).isEmpty(): - "Can't find super function for " + method.getPsiMethod() + " defined in " - + method.getPsiMethod().getContainingClass(); + //assert !JavaToKotlinClassMap.getInstance().mapPlatformClass( + // new FqName(superSignature.getMethod().getContainingClass().getQualifiedName())).isEmpty(): + // "Can't find super function for " + method.getPsiMethod() + " defined in " + // + method.getPsiMethod().getContainingClass(); } } return superFunctions;