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

IDEA-66018 provide smart completion for assertEquals() arguments

Browse Source
This commit is contained in:
peter
2011-07-18 16:58:51 +02:00
parent 20f9c56ae8
commit 045baa388b
3 changed files with 66 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
+49 -35
View File
@@ -28,7 +28,10 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.PsiShortNamesCache;
import com.intellij.psi.search.searches.DeepestSuperMethodsSearch;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.*;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.NullableFunction;
import com.intellij.util.Processor;
@@ -581,7 +584,6 @@ public class ExpectedTypesProvider {
}
PsiExpression anotherExpr = op1.equals(myExpr) ? op2 : op1;
PsiType anotherType = anotherExpr != null ? anotherExpr.getType() : null;
PsiElementFactory factory = JavaPsiFacade.getInstance(expr.getProject()).getElementFactory();
IElementType i = expr.getOperationTokenType();
if (i == JavaTokenType.MINUS ||
i == JavaTokenType.ASTERISK ||
@@ -626,36 +628,8 @@ public class ExpectedTypesProvider {
}
}
else if (i == JavaTokenType.EQEQ || i == JavaTokenType.NE) {
if (anotherType == null) {
myResult = ExpectedTypeInfo.EMPTY_ARRAY;
}
else {
ExpectedTypeInfoImpl info;
if (anotherType instanceof PsiPrimitiveType) {
if (PsiType.BOOLEAN.equals(anotherType)) {
info = createInfoImpl(anotherType, ExpectedTypeInfo.TYPE_STRICTLY, anotherType, TailType.NONE);
}
else if (PsiType.NULL.equals(anotherType)) {
PsiType objectType = factory.createTypeByFQClassName("java.lang.Object", myExpr.getResolveScope());
info = createInfoImpl(objectType, ExpectedTypeInfo.TYPE_OR_SUBTYPE, objectType, TailType.NONE);
}
else {
info = createInfoImpl(PsiType.DOUBLE, ExpectedTypeInfo.TYPE_OR_SUBTYPE, anotherType, TailType.NONE);
}
}
else {
info = createInfoImpl(anotherType, ExpectedTypeInfo.TYPE_STRICTLY, anotherType, TailType.NONE);
}
if (anotherExpr instanceof PsiReferenceExpression) {
PsiElement refElement = ((PsiReferenceExpression)anotherExpr).resolve();
if (refElement instanceof PsiVariable) {
info.expectedName = getPropertyName((PsiVariable)refElement);
}
}
myResult = new ExpectedTypeInfo[]{info};
}
ExpectedTypeInfo info = getEqualsType(anotherExpr);
myResult = info == null ? ExpectedTypeInfo.EMPTY_ARRAY : new ExpectedTypeInfo[]{info};
}
else if (i == JavaTokenType.LTLT || i == JavaTokenType.GTGT || i == JavaTokenType.GTGTGT) {
if (anotherType == null) {
@@ -687,6 +661,40 @@ public class ExpectedTypesProvider {
}
}
@Nullable
private static ExpectedTypeInfo getEqualsType(@Nullable PsiExpression anotherExpr) {
PsiType anotherType = anotherExpr != null ? anotherExpr.getType() : null;
if (anotherType == null) {
return null;
}
ExpectedTypeInfoImpl info;
if (anotherType instanceof PsiPrimitiveType) {
if (PsiType.BOOLEAN.equals(anotherType)) {
info = createInfoImpl(anotherType, ExpectedTypeInfo.TYPE_STRICTLY, anotherType, TailType.NONE);
}
else if (PsiType.NULL.equals(anotherType)) {
PsiType objectType = PsiType.getJavaLangObject(anotherExpr.getManager(), anotherExpr.getResolveScope());
info = createInfoImpl(objectType, ExpectedTypeInfo.TYPE_OR_SUBTYPE, objectType, TailType.NONE);
}
else {
info = createInfoImpl(PsiType.DOUBLE, ExpectedTypeInfo.TYPE_OR_SUBTYPE, anotherType, TailType.NONE);
}
}
else {
info = createInfoImpl(anotherType, ExpectedTypeInfo.TYPE_STRICTLY, anotherType, TailType.NONE);
}
if (anotherExpr instanceof PsiReferenceExpression) {
PsiElement refElement = ((PsiReferenceExpression)anotherExpr).resolve();
if (refElement instanceof PsiVariable) {
info.expectedName = getPropertyName((PsiVariable)refElement);
}
}
return info;
}
@Override public void visitPrefixExpression(PsiPrefixExpression expr) {
IElementType i = expr.getOperationTokenType();
final PsiType type = expr.getType();
@@ -984,7 +992,7 @@ public class ExpectedTypesProvider {
PsiType parameterType = getParameterType(parameter, substitutor);
TailType tailType = getMethodArgumentTailType(argument, index, method, substitutor, parameters);
PsiType defaultType = getDefaultType(method, substitutor, parameterType, argument);
PsiType defaultType = getDefaultType(method, substitutor, parameterType, argument, args);
ExpectedTypeInfoImpl info = createInfoImpl(parameterType, ExpectedTypeInfo.TYPE_OR_SUBTYPE, defaultType, tailType);
info.setInsertExplicitTypeParams(true);
@@ -1043,7 +1051,7 @@ public class ExpectedTypesProvider {
@Nullable
private static PsiType getDefaultType(final PsiMethod method, final PsiSubstitutor substitutor, final PsiType parameterType,
final PsiExpression argumentList) {
final PsiExpression argument, PsiExpression[] args) {
final PsiClass containingClass = method.getContainingClass();
if (containingClass == null) return parameterType;
@@ -1067,7 +1075,7 @@ public class ExpectedTypesProvider {
if ("equals".equals(name)) {
final PsiType type = checkMethod(method, CommonClassNames.JAVA_LANG_OBJECT, new NullableFunction<PsiClass, PsiType>() {
public PsiType fun(final PsiClass psiClass) {
final PsiElement parent = argumentList.getParent().getParent();
final PsiElement parent = argument.getParent().getParent();
if (parent instanceof PsiMethodCallExpression) {
final PsiMethodCallExpression expression = (PsiMethodCallExpression)parent;
final PsiExpression qualifierExpression = expression.getMethodExpression().getQualifierExpression();
@@ -1084,6 +1092,12 @@ public class ExpectedTypesProvider {
});
if (type != null) return type;
}
if (("assertEquals".equals(name) || "assertSame".equals(name)) && method.getParameterList().getParametersCount() == 2 && args.length == 2) {
ExpectedTypeInfo info = getEqualsType(args[0] == argument ? args[1] : args[0]);
if (info != null) {
return info.getDefaultType();
}
}
return parameterType;
}
java/java-tests/testData/codeInsight/completion/smartTypeSorting/AssertEquals.java
+12
View File
@@ -0,0 +1,12 @@
import junit.framework.Assert;
import java.io.File;
public class Aaaaaaa extends Assert {
{
File boo;
int bar;
assertEquals(new File("x"), b<caret>);
}
}
java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionOrderingTest.groovy
+5
View File
@@ -270,6 +270,11 @@ public class SmartTypeCompletionOrderingTest extends CompletionSortingTestCase {
assertEquals("Bar", presentation.getItemText());
}
public void testAssertEquals() throws Throwable {
myFixture.addClass("package junit.framework; public class Assert { public static void assertEquals(Object a, Object b) {} }");
checkPreferredItems(0, "boo", "bar")
}
@Override
protected String getBasePath() {
return JavaTestUtil.getRelativeJavaTestDataPath() + BASE_PATH;