MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-06 05:10:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

overload resolution: check method hiding for static only (IDEA-183712)

Browse Source 
non-static methods should already be covered by same signatures check
This commit is contained in:
Anna.Kozlova
2017-12-13 13:44:11 +01:00
parent 14a9d09035
commit 1d6641db80
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
View File

@@ -214,7 +214,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
final PsiClass containingClass = method.getContainingClass();
final boolean isInterface = containingClass != null && containingClass.isInterface();
for (HierarchicalMethodSignature methodSignature : method.getHierarchicalMethodSignature().getSuperSignatures()) {
final PsiMethod superMethod = methodSignature.getMethod();
PsiMethod superMethod = PsiSuperMethodUtil.correctMethodByScope(methodSignature.getMethod(), myArgumentsList.getResolveScope());
if (!isInterface) {
superMethods.add(superMethod);
}
@@ -587,7 +587,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
}
}
if (class1 != class2) {
if (class1 != class2 && (method1.hasModifierProperty(PsiModifier.STATIC) || method2.hasModifierProperty(PsiModifier.STATIC))) {
if (class2.isInheritor(class1, true)) {
if (MethodSignatureUtil.isSubsignature(method1.getSignature(classSubstitutor1), method2.getSignature(classSubstitutor2))) {
return Specifics.SECOND;

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/OverriddenMethodWithOtherRawSignature.java Normal file
View File

@@ -0,0 +1,13 @@
class X {
void method(String t) { }
}
class Y<S extends CharSequence> extends X {
void method(S s) { }
}
class Test {
void x(final Y<String> err) {
err.method<error descr="Ambiguous method call: both 'Y.method(String)' and 'X.method(String)' match">("")</error>;
}
}

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/lambda/OverloadResolutionTest.java
View File

@@ -262,6 +262,8 @@ public class OverloadResolutionTest extends LightDaemonAnalyzerTestCase {
public void testAdaptReturnTypesOfSiblingMethods() { doTest(false);}
public void testOverriddenMethodWithOtherRawSignature() { doTest(false);}
public void testUnqualifiedStaticInterfaceMethodCallsOnInnerClasses() { doTest(false);}
public void testStaticMethodInSuperInterfaceConflictWithCurrentStatic() { doTest(false);}