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

smart completion: diamonds: forbid non applicable diamonds based on the completion position (IDEA-87053)

Browse Source
This commit is contained in:
Anna Kozlova
2012-06-06 14:37:03 +04:00
parent e351e49a8a
commit bbb0760dbb
4 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaInheritorsGetter.java
+9 -7
View File
@@ -19,6 +19,7 @@ import com.intellij.codeInsight.CodeInsightUtil;
import com.intellij.codeInsight.ExpectedTypeInfo;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightClassUtil;
import com.intellij.codeInsight.lookup.*;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Condition;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
@@ -154,14 +155,15 @@ public class JavaInheritorsGetter extends CompletionProvider<CompletionParameter
}
private static boolean areInferredTypesApplicable(@NotNull PsiType[] types, PsiElement originalPosition) {
final PsiNewExpression newExpression = PsiTreeUtil.getParentOfType(originalPosition, PsiNewExpression.class);
if (newExpression != null) {
final PsiMethodCallExpression methodCallExpression = PsiTreeUtil.getParentOfType(originalPosition, PsiMethodCallExpression.class);
if (methodCallExpression != null &&
ArrayUtil.find(methodCallExpression.getArgumentList().getExpressions(), newExpression) > -1) {
final PsiMethodCallExpression methodCallExpression = PsiTreeUtil.getParentOfType(originalPosition, PsiMethodCallExpression.class);
if (methodCallExpression != null) {
final PsiNewExpression newExpression = PsiTreeUtil.getParentOfType(originalPosition, PsiNewExpression.class);
if (newExpression != null && ArrayUtil.find(methodCallExpression.getArgumentList().getExpressions(), newExpression) > -1 ||
Comparing.equal(originalPosition.getParent(), methodCallExpression.getArgumentList())) {
final JavaResolveResult resolveResult = methodCallExpression.resolveMethodGenerics();
PsiMethod method = (PsiMethod)resolveResult.getElement();
return method == null || PsiUtil.getApplicabilityLevel(method, resolveResult.getSubstitutor(), types, PsiUtil.getLanguageLevel(originalPosition))
final PsiMethod method = (PsiMethod)resolveResult.getElement();
return method == null ||
PsiUtil.getApplicabilityLevel(method, resolveResult.getSubstitutor(), types, PsiUtil.getLanguageLevel(originalPosition))
!= MethodCandidateInfo.ApplicabilityLevel.NOT_APPLICABLE;
}
}
java/java-tests/testData/codeInsight/completion/smartType/DiamondNotCollapsedNotApplicable-out.java
+15
View File
@@ -0,0 +1,15 @@
import java.util.ArrayList;
public class TestCompletion {
public static void test() {
A<ArrayList<String>> ref = new A<>();
ref.set(new ArrayList<String>(<caret>) );
}
}
class A<V> {
A() {
}
void set(V v){}
}
java/java-tests/testData/codeInsight/completion/smartType/DiamondNotCollapsedNotApplicable.java
+15
View File
@@ -0,0 +1,15 @@
import java.util.ArrayList;
public class TestCompletion {
public static void test() {
A<ArrayList<String>> ref = new A<>();
ref.set(new <caret> );
}
}
class A<V> {
A() {
}
void set(V v){}
}
java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType17CompletionTest.java
+4
View File
@@ -46,6 +46,10 @@ public class SmartType17CompletionTest extends LightFixtureCompletionTestCase {
doTest();
}
public void testDiamondNotCollapsedNotApplicable() throws Exception {
doTest();
}
public void testDiamondNotCollapsedInCaseOfAnonymousClasses() throws Exception {
doTest();
}