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

Not looking for super methods which are Object methods in interfaces, because they are not loaded by JDR.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-27 17:25:44 +04:00
parent d8ccfe55b6
commit 8130c813e9
2 changed files with 6 additions and 2 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
+5 -1
View File
@@ -33,6 +33,7 @@ import org.jetbrains.jet.lang.resolve.BindingContextUtils;
import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.*; import org.jetbrains.jet.lang.resolve.java.*;
import org.jetbrains.jet.lang.resolve.java.provider.MembersCache;
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.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
@@ -228,7 +229,10 @@ public class SignaturesPropagationData {
? trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, ((JetClsMethod) superMethod).getOrigin()) ? trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, ((JetClsMethod) superMethod).getOrigin())
: findSuperFunction(superclassToFunctions.get(classFqName), superMethod); : findSuperFunction(superclassToFunctions.get(classFqName), superMethod);
if (superFun == null) { if (superFun == null) {
reportCantFindSuperFunction(method); // Super methods which are Object methods in interfaces are not loaded by JDR.
if (!MembersCache.isObjectMethodInInterface(superMethod)) {
reportCantFindSuperFunction(method);
}
continue; continue;
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/MembersCache.java
+1 -1
View File
@@ -315,7 +315,7 @@ public final class MembersCache {
} }
} }
private static boolean isObjectMethodInInterface(@NotNull PsiMember member) { public static boolean isObjectMethodInInterface(@NotNull PsiMember member) {
if (!(member instanceof PsiMethod)) { if (!(member instanceof PsiMethod)) {
return false; return false;
} }