MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 13:31:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

generics: from same signature methods prefer methods without wildcards (IDEA-90802)

Browse Source
This commit is contained in:
anna
2012-10-31 14:23:18 +01:00
parent 06e746448c
commit f743e7ae8c
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -282,9 +282,15 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
}
if (currentClass != null && InheritanceUtil.isInheritorOrSelf(currentClass, class1, true) && InheritanceUtil.isInheritorOrSelf(currentClass, existingClass, true)) {
if (MethodSignatureUtil.areSignaturesEqual(existingMethod.getSignature(TypeConversionUtil.getSuperClassSubstitutor(existingClass, currentClass, PsiSubstitutor.EMPTY)),
method.getSignature(TypeConversionUtil.getSuperClassSubstitutor(class1, currentClass, PsiSubstitutor.EMPTY)))) {
conflicts.remove(i);
final PsiSubstitutor eSubstitutor = TypeConversionUtil.getSuperClassSubstitutor(existingClass, currentClass, PsiSubstitutor.EMPTY);
final PsiSubstitutor cSubstitutor = TypeConversionUtil.getSuperClassSubstitutor(class1, currentClass, PsiSubstitutor.EMPTY);
if (MethodSignatureUtil.areSignaturesEqual(existingMethod.getSignature(eSubstitutor), method.getSignature(cSubstitutor))) {
final PsiType returnType = cSubstitutor.substitute(method.getReturnType());
if (PsiUtil.captureToplevelWildcards(returnType, method).equals(returnType)) {
conflicts.remove(existing);
} else {
conflicts.remove(i);
}
i--;
break;
}

24
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA90802.java Normal file
View File

@@ -0,0 +1,24 @@
import java.util.*;
interface VcsRoot {
}
interface SVcsRoot extends VcsRoot {
}
interface A {
List<? extends VcsRoot> getVcsRoots();
}
interface B {
List<SVcsRoot> getVcsRoots();
}
interface F1 extends A, B {
}
class G {
void f(F1 o) {
SVcsRoot r = o.getVcsRoots().get(0);
}
}

1
java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
View File

@@ -180,6 +180,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testIDEA57310() throws Exception { doTest(false); }
public void testIDEA57311() throws Exception { doTest(false); }
public void testIDEA57309() throws Exception { doTest(false); }
public void testIDEA90802() throws Exception { doTest(false); }
public void testInconvertibleTypes() throws Exception { doTest(false); }
public void testIncompatibleReturnType() throws Exception { doTest(false); }
public void testContinueInferenceAfterFirstRawResult() throws Exception { doTest(false); }