azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Temporarily disabled assert in SignaturesPropagation which fails due to bug in IDEA.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-11-20 14:36:35 +04:00
parent 8252c51ebc
commit 837cf38e91
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java
+8 -6
View File
@@ -26,9 +26,7 @@ import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.java.CollectionClassMapping; 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.java.wrapper.PsiMethodWrapper;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedure; import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedure;
@@ -64,11 +62,15 @@ public class SignaturesPropagation {
superFunctions.add(((FunctionDescriptor) superFun)); superFunctions.add(((FunctionDescriptor) superFun));
} }
else { 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) // Function descriptor can't be find iff superclass is java.lang.Collection or similar (translated to jet.* collections)
assert !JavaToKotlinClassMap.getInstance().mapPlatformClass( //assert !JavaToKotlinClassMap.getInstance().mapPlatformClass(
new FqName(superSignature.getMethod().getContainingClass().getQualifiedName())).isEmpty(): // new FqName(superSignature.getMethod().getContainingClass().getQualifiedName())).isEmpty():
"Can't find super function for " + method.getPsiMethod() + " defined in " // "Can't find super function for " + method.getPsiMethod() + " defined in "
+ method.getPsiMethod().getContainingClass(); // + method.getPsiMethod().getContainingClass();
} }
} }
return superFunctions; return superFunctions;