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: don't ignore method with incorrect number of parameters when it overrides vararg method (IDEA-165829)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-12-27 11:22:32 +01:00
parent 6cdca2a38c
commit 8f533a3edc
3 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,9 +91,6 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
if (conflicts.isEmpty()) return null;
if (conflicts.size() == 1) return conflicts.get(0);
boolean atLeastOneMatch = checkParametersNumber(conflicts, getActualParametersLength(), true);
if (conflicts.size() == 1) return conflicts.get(0);
final FactoryMap<MethodCandidateInfo, PsiSubstitutor> map = new FactoryMap<MethodCandidateInfo, PsiSubstitutor>() {
@Nullable
@Override
@@ -101,6 +98,8 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
return key.getSubstitutor(false);
}
};
boolean atLeastOneMatch = checkParametersNumber(conflicts, getActualParametersLength(), map, true);
if (conflicts.size() == 1) return conflicts.get(0);
checkSameSignatures(conflicts, map);
if (conflicts.size() == 1) return conflicts.get(0);
@@ -108,7 +107,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
checkAccessStaticLevels(conflicts, true);
if (conflicts.size() == 1) return conflicts.get(0);
checkParametersNumber(conflicts, getActualParametersLength(), false);
checkParametersNumber(conflicts, getActualParametersLength(), map, false);
if (conflicts.size() == 1) return conflicts.get(0);
checkStaticMethodsOfInterfaces(conflicts);
@@ -434,6 +433,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
public boolean checkParametersNumber(@NotNull List<CandidateInfo> conflicts,
final int argumentsCount,
FactoryMap<MethodCandidateInfo, PsiSubstitutor> map,
boolean ignoreIfStaticsProblem) {
boolean atLeastOneMatch = false;
TIntArrayList unmatchedIndices = null;
@@ -444,12 +444,25 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
if (!(info instanceof MethodCandidateInfo)) continue;
PsiMethod method = ((MethodCandidateInfo)info).getElement();
final int parametersCount = method.getParameterList().getParametersCount();
if (((myLanguageLevel.isAtLeast(LanguageLevel.JDK_1_8) ? ((MethodCandidateInfo)info).isVarargs() : method.isVarArgs()) && parametersCount - 1 <= argumentsCount) ||
parametersCount == argumentsCount) {
boolean isVarargs = (myLanguageLevel.isAtLeast(LanguageLevel.JDK_1_8) ? ((MethodCandidateInfo)info).isVarargs() : method.isVarArgs()) &&
parametersCount - 1 <= argumentsCount;
if (isVarargs || parametersCount == argumentsCount) {
// remove all unmatched before
if (unmatchedIndices != null) {
for (int u=unmatchedIndices.size()-1; u>=0; u--) {
int index = unmatchedIndices.get(u);
//ensure super method with varargs won't win over non-vararg override
if (ignoreIfStaticsProblem && isVarargs) {
MethodCandidateInfo candidateInfo = (MethodCandidateInfo)conflicts.get(index);
PsiMethod candidateToRemove = candidateInfo.getElement();
if (candidateToRemove != method) {
PsiSubstitutor candidateToRemoveSubst = map.get(candidateInfo);
PsiSubstitutor substitutor = map.get(info);
if (MethodSignatureUtil.isSubsignature(candidateToRemove.getSignature(candidateToRemoveSubst), method.getSignature(substitutor))) {
continue;
}
}
}
conflicts.remove(index);
i--;
}

15
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/OverriddenVarargWithaArray.java Normal file
View File

@@ -0,0 +1,15 @@
interface TypeA {
void test(String... arg);
}
interface TypeB extends TypeA {
void test(String[] arg);
}
class Test {
void foo(final TypeB typeB) {
typeB.test<error descr="'test(java.lang.String[])' in 'TypeB' cannot be applied to '(java.lang.String, java.lang.String)'">("a", "b")</error>;
typeB.test<error descr="'test(java.lang.String[])' in 'TypeB' cannot be applied to '(java.lang.String)'">("a")</error>;
typeB.test<error descr="'test(java.lang.String[])' in 'TypeB' cannot be applied to '()'">()</error>;
}
}

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

@@ -236,6 +236,10 @@ public class OverloadResolutionTest extends LightDaemonAnalyzerTestCase {
doTest(false);
}
public void testOverriddenVarargWithaArray() throws Exception {
doTest();
}
private void doTest() {
doTest(true);
}