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

Enabled assert.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-04 16:02:37 +04:00
parent 5e86cbe004
commit d7624aa7b6
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
+17 -7
View File
@@ -19,7 +19,10 @@ package org.jetbrains.jet.lang.resolve.java.kotlinSignature;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.HierarchicalMethodSignature; import com.intellij.psi.HierarchicalMethodSignature;
import com.intellij.psi.PsiClass;
import com.intellij.util.Function; import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -43,6 +46,8 @@ import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getVarargParameterType; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getVarargParameterType;
public class SignaturesPropagationData { public class SignaturesPropagationData {
private static final Logger LOG = Logger.getInstance(SignaturesPropagationData.class);
private final List<TypeParameterDescriptor> modifiedTypeParameters; private final List<TypeParameterDescriptor> modifiedTypeParameters;
private final JavaDescriptorResolver.ValueParameterDescriptors modifiedValueParameters; private final JavaDescriptorResolver.ValueParameterDescriptors modifiedValueParameters;
private final JetType modifiedReturnType; private final JetType modifiedReturnType;
@@ -200,16 +205,21 @@ public class SignaturesPropagationData {
superFunctions.add(((FunctionDescriptor) superFun)); superFunctions.add(((FunctionDescriptor) superFun));
} }
else { else {
String fqName = superSignature.getMethod().getContainingClass().getQualifiedName(); PsiClass psiClass = superSignature.getMethod().getContainingClass();
assert psiClass != null;
String fqName = psiClass.getQualifiedName();
assert fqName != null; assert fqName != null;
Collection<ClassDescriptor> platformClasses = JavaToKotlinClassMap.getInstance().mapPlatformClass(new FqName(fqName)); Collection<ClassDescriptor> platformClasses = JavaToKotlinClassMap.getInstance().mapPlatformClass(new FqName(fqName));
if (platformClasses.isEmpty()) { if (platformClasses.isEmpty()) {
// TODO assert is temporarily disabled String errorMessage = "Can't find super function for " + method.getPsiMethod() +
// It fails because of bug in IDEA on Mac: it adds invalid roots to JDK classpath and it leads to the problem that " defined in " + method.getPsiMethod().getContainingClass();
// getHierarchicalMethodSignature() returns elements from invalid virtual files if (ApplicationManager.getApplication().isUnitTestMode()) {
throw new IllegalStateException(errorMessage);
//assert false : "Can't find super function for " + method.getPsiMethod() + }
// " defined in " + method.getPsiMethod().getContainingClass() else {
LOG.error(errorMessage);
}
} }
else { else {
List<FunctionDescriptor> funsFromMap = List<FunctionDescriptor> funsFromMap =