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

Getting super methods correctly for inheritors of Collection, etc.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-10 21:33:43 +04:00
parent a93596ca5e
commit 34f9ae77ba
3 changed files with 34 additions and 22 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
+22 -22
View File
@@ -201,36 +201,36 @@ public class SignaturesPropagationData {
List<FunctionDescriptor> superFunctions = Lists.newArrayList();
for (HierarchicalMethodSignature superSignature : method.getPsiMethod().getHierarchicalMethodSignature().getSuperSignatures()) {
PsiMethod superMethod = superSignature.getMethod();
PsiClass psiClass = superMethod.getContainingClass();
assert psiClass != null;
String classFqName = psiClass.getQualifiedName();
assert classFqName != null;
if (!JavaToKotlinClassMap.getInstance().mapPlatformClass(new FqName(classFqName)).isEmpty()) {
List<FunctionDescriptor> funsFromMap = JavaToKotlinMethodMap.INSTANCE.getFunctions(superMethod, containingClass);
superFunctions.addAll(funsFromMap);
continue;
}
PsiElement superDeclaration = superMethod instanceof JetClsMethod ? ((JetClsMethod) superMethod).getOrigin() : superMethod;
DeclarationDescriptor superFun = trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, superDeclaration);
if (superFun instanceof FunctionDescriptor) {
superFunctions.add(((FunctionDescriptor) superFun));
}
else {
PsiClass psiClass = superMethod.getContainingClass();
assert psiClass != null;
String fqName = psiClass.getQualifiedName();
assert fqName != null;
Collection<ClassDescriptor> platformClasses = JavaToKotlinClassMap.getInstance().mapPlatformClass(new FqName(fqName));
if (platformClasses.isEmpty()) {
String errorMessage = "Can't find super function for " + method.getPsiMethod() +
" defined in " + method.getPsiMethod().getContainingClass();
if (ApplicationManager.getApplication().isUnitTestMode()) {
throw new IllegalStateException(errorMessage);
}
else {
if (SystemInfo.isMac) {
LOG.error("Remove duplicates from your JDK definition\n" + errorMessage);
}
else {
LOG.error(errorMessage);
}
}
String errorMessage = "Can't find super function for " + method.getPsiMethod() +
" defined in " + method.getPsiMethod().getContainingClass();
if (ApplicationManager.getApplication().isUnitTestMode()) {
throw new IllegalStateException(errorMessage);
}
else {
List<FunctionDescriptor> funsFromMap = JavaToKotlinMethodMap.INSTANCE.getFunctions(superMethod, containingClass);
superFunctions.addAll(funsFromMap);
if (SystemInfo.isMac) {
LOG.error("Remove duplicates from your JDK definition\n" + errorMessage);
}
else {
LOG.error(errorMessage);
}
}
}
}
compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.kt
+7
View File
@@ -0,0 +1,7 @@
import java.util.ArrayList
fun foo(p: <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.util.List<String><!>) {
p.iterator(); // forcing resolve of java.util.List.iterator()
ArrayList<String>().iterator(); // this provoked exception in SignaturesPropagationData
}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+5
View File
@@ -3390,6 +3390,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
doTest("compiler/testData/diagnostics/tests/regressions/OverrideResolution.kt");
}
@TestMetadata("resolveSubclassOfList.kt")
public void testResolveSubclassOfList() throws Exception {
doTest("compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.kt");
}
@TestMetadata("SpecififcityByReceiver.kt")
public void testSpecififcityByReceiver() throws Exception {
doTest("compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.kt");