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

diamonds: resolve possible 'vararg' conflict by normal resolver

Browse Source
This commit is contained in:
Anna Kozlova
2015-11-20 18:22:02 +01:00
parent 9a23d158f8
commit aded26aa0a
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
+8 -12
View File
@@ -235,19 +235,15 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
}
final MethodCandidateInfo staticFactoryCandidateInfo = createMethodCandidate(staticFactory, context, false, argumentList);
if (staticFactory.isVarArgs()) {
final Computable<Integer> computable = new Computable<Integer>() {
@Override
public Integer compute() {
return staticFactoryCandidateInfo.getPertinentApplicabilityLevel();
}
};
final Integer applicability = MethodCandidateInfo.ourOverloadGuard.doPreventingRecursion(newExpression, true, computable);
if ((applicability != null ? applicability : staticFactoryCandidateInfo.getApplicabilityLevel()) < MethodCandidateInfo.ApplicabilityLevel.FIXED_ARITY) {
return createMethodCandidate(staticFactory, context, true, argumentList);
}
if (!staticFactory.isVarArgs()) {
return staticFactoryCandidateInfo;
}
return staticFactoryCandidateInfo;
final JavaMethodsConflictResolver resolver = new JavaMethodsConflictResolver(argumentList, PsiUtil.getLanguageLevel(argumentList));
final ArrayList<CandidateInfo> conflicts = new ArrayList<CandidateInfo>();
conflicts.add(staticFactoryCandidateInfo);
conflicts.add(createMethodCandidate(staticFactory, context, true, argumentList));
return resolver.resolveConflict(conflicts);
}
@Nullable