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

IDEA-113149 Constructor parameters completion is not available in case of classes with generics

Browse Source
This commit is contained in:
peter
2013-09-06 18:33:23 +02:00
parent 243adf0667
commit 75c1cd600f
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java
+5 -6
View File
@@ -34,9 +34,8 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import static com.intellij.patterns.PlatformPatterns.psiElement;
@@ -55,7 +54,7 @@ class SameSignatureCallParametersProvider extends CompletionProvider<CompletionP
@NotNull CompletionResultSet result) {
final PsiCall methodCall = PsiTreeUtil.getParentOfType(parameters.getPosition(), PsiCall.class);
assert methodCall != null;
List<Pair<PsiMethod, PsiSubstitutor>> candidates = getCallCandidates(methodCall);
Set<Pair<PsiMethod, PsiSubstitutor>> candidates = getCallCandidates(methodCall);
PsiMethod container = PsiTreeUtil.getParentOfType(methodCall, PsiMethod.class);
while (container != null) {
@@ -93,8 +92,8 @@ class SameSignatureCallParametersProvider extends CompletionProvider<CompletionP
return TailTypeDecorator.withTail(element, ExpectedTypesProvider.getFinalCallParameterTailType(call, invoked.getReturnType(), invoked));
}
private static List<Pair<PsiMethod, PsiSubstitutor>> getCallCandidates(PsiCall expression) {
List<Pair<PsiMethod, PsiSubstitutor>> candidates = new ArrayList<Pair<PsiMethod, PsiSubstitutor>>();
private static Set<Pair<PsiMethod, PsiSubstitutor>> getCallCandidates(PsiCall expression) {
Set<Pair<PsiMethod, PsiSubstitutor>> candidates = ContainerUtil.newLinkedHashSet();
JavaResolveResult[] results;
if (expression instanceof PsiMethodCallExpression) {
results = ((PsiMethodCallExpression)expression).getMethodExpression().multiResolve(false);
@@ -108,7 +107,7 @@ class SameSignatureCallParametersProvider extends CompletionProvider<CompletionP
final PsiClass psiClass = ((PsiMethod)element).getContainingClass();
if (psiClass != null) {
for (Pair<PsiMethod, PsiSubstitutor> overload : psiClass.findMethodsAndTheirSubstitutorsByName(((PsiMethod)element).getName(), true)) {
candidates.add(overload);
candidates.add(Pair.create(overload.first, candidate.getSubstitutor().putAll(overload.second)));
}
break;
}
java/java-tests/testData/codeInsight/completion/smartType/SameSignatureWithGenerics.java
+8
View File
@@ -0,0 +1,8 @@
class A<T> {
public A(T i, String z, String zz) {}
}
class B extends A<String> {
public B(String i, String zz, String z) {
super(<caret>);
}
}
java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java
+5
View File
@@ -792,6 +792,11 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase {
checkResultByTestName();
}
public void testSameSignatureWithGenerics() {
configureByTestName();
myFixture.assertPreferredCompletionItems(0, "i", "z", "zz", "i, z, zz");
}
public void testWrongAnonymous() throws Throwable {
configureByTestName();
select();