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

method conflicts: prefer method with more specific return type (IDEA-67570)

Browse Source
This commit is contained in:
anna
2013-01-08 13:44:08 +01:00
parent 5f7a5c98d7
commit 93a7d9f158
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
+2 -1
View File
@@ -285,7 +285,8 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
final PsiSubstitutor cSubstitutor = TypeConversionUtil.getSuperClassSubstitutor(class1, currentClass, PsiSubstitutor.EMPTY);
if (MethodSignatureUtil.areSignaturesEqual(existingMethod.getSignature(eSubstitutor), method.getSignature(cSubstitutor))) {
final PsiType returnType = eSubstitutor.substitute(existingMethod.getReturnType());
if (!PsiUtil.captureToplevelWildcards(returnType, existingMethod).equals(returnType)) {
final PsiType returnType1 = cSubstitutor.substitute(method.getReturnType());
if (returnType != null && returnType1 != null && !returnType1.equals(returnType) && TypeConversionUtil.isAssignable(returnType, returnType1, false)) {
conflicts.remove(existing);
} else {
conflicts.remove(i);
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA67570.java
+21
View File
@@ -0,0 +1,21 @@
interface A1
{
String foo();
}
interface B1
{
Object foo();
}
class C1<T extends B1 & A1> {
void bar(T x) {
String foo = x.foo();
}
}
class C2<T extends A1 & B1> {
void bar(T x) {
String foo = x.foo();
}
}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
+1
View File
@@ -198,6 +198,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testIDEA67861() { doTest7Incompatibility(false); }
public void testIDEA67597() { doTest5(false); }
public void testIDEA57539() { doTest5(false); }
public void testIDEA67570() { doTest5(false); }
public void testJavaUtilCollections_NoVerify() throws Exception {
PsiClass collectionsClass = getJavaFacade().findClass("java.util.Collections", GlobalSearchScope.moduleWithLibrariesScope(getModule()));
java/java-tests/testSrc/com/intellij/psi/PsiConcurrencyStressTest.java
-1
View File
@@ -27,7 +27,6 @@ import com.intellij.openapi.application.Result;
import com.intellij.openapi.application.ex.PathManagerEx;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.search.GlobalSearchScope;