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

remove wrong capture treatment: the completion result is incorrect (IDEA-155188)

Browse Source
This commit is contained in:
peter
2016-05-03 14:25:59 +02:00
parent d76c71a4a4
commit 20f69c8111
3 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
+4 -12
View File
@@ -270,7 +270,10 @@ public class JavaCompletionUtil {
final int parameterIndex = lambdaExpression.getParameterList().getParameterIndex((PsiParameter)resolve);
final Set<LookupElement> set = new LinkedHashSet<LookupElement>();
final boolean overloadsFound = LambdaUtil.processParentOverloads(lambdaExpression, functionalInterfaceType -> {
PsiType qualifierType = removeTopLevelWildcards(LambdaUtil.getLambdaParameterFromType(functionalInterfaceType, parameterIndex));
PsiType qualifierType = LambdaUtil.getLambdaParameterFromType(functionalInterfaceType, parameterIndex);
if (qualifierType instanceof PsiWildcardType) {
qualifierType = ((PsiWildcardType)qualifierType).getBound();
}
if (qualifierType == null) return;
PsiReferenceExpression fakeRef = createReference("xxx.xxx", createContextWithXxxVariable(element, qualifierType));
@@ -285,17 +288,6 @@ public class JavaCompletionUtil {
return processJavaQualifiedReference(element, javaReference, elementFilter, options, matcher, parameters);
}
@Nullable
private static PsiType removeTopLevelWildcards(@Nullable PsiType qualifierType) {
if (qualifierType instanceof PsiCapturedWildcardType) {
return removeTopLevelWildcards(((PsiCapturedWildcardType)qualifierType).getWildcard());
}
if (qualifierType instanceof PsiWildcardType) {
return removeTopLevelWildcards(((PsiWildcardType)qualifierType).getBound());
}
return qualifierType;
}
private static Set<LookupElement> processJavaQualifiedReference(PsiElement element, PsiJavaReference javaReference, ElementFilter elementFilter,
JavaCompletionProcessor.Options options,
final PrefixMatcher matcher, CompletionParameters parameters) {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/completion/normal/LambdaWithCapturedSuperWildcardInAmbiguousCall.java
-8
View File
@@ -1,8 +0,0 @@
import java.util.stream.*;
import java.util.*;
class Foo {
void main(Stream<? super String> stream) {
stream.collect(Collectors.toMap(o -> o.sub<caret>))
}
}
java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal8CompletionTest.groovy
-4
View File
@@ -249,10 +249,6 @@ class Test88 {
configureByTestName()
myFixture.assertPreferredCompletionItems(0, 'substring', 'substring', 'subSequence')
}
public void testLambdaWithCapturedSuperWildcardInAmbiguousCall() {
configureByTestName()
myFixture.assertPreferredCompletionItems(0, 'substring', 'substring', 'subSequence')
}
public void testUnexpectedLambdaInAmbiguousCall() { doAntiTest() }
public void testNoCollectorsInComment() { doAntiTest() }