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

create from usage: don't ignore types if no expected methods detected

Browse Source 
IDEA-193066 check expected type as well by another expression
This commit is contained in:
Anna Kozlova
2018-06-01 19:10:12 +03:00
parent ce8366714f
commit 31fd8cfe08
4 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
View File

@@ -651,7 +651,13 @@ public class ExpectedTypesProvider {
final int index = Arrays.asList(operands).indexOf(myExpr);
if (index < 0) return; // broken syntax
IElementType op = expr.getOperationTokenType();
PsiExpression anotherExpr = index > 0 ? operands[0] : 1 < operands.length ? operands[1] : null;
if (myForCompletion && index == 0) {
if (op == JavaTokenType.EQEQ || op == JavaTokenType.NE) {
ContainerUtil.addIfNotNull(myResult, getEqualsType(anotherExpr));
}
final MyParentVisitor visitor = new MyParentVisitor(expr, true, myClassProvider, myVoidable, myUsedAfter);
myExpr = (PsiExpression)myExpr.getParent();
expr.getParent().accept(visitor);
@@ -666,22 +672,22 @@ public class ExpectedTypesProvider {
}
return;
}
PsiExpression anotherExpr = index > 0 ? operands[0] : 1 < operands.length ? operands[1] : null;
PsiType anotherType = anotherExpr != null ? anotherExpr.getType() : null;
IElementType i = expr.getOperationTokenType();
if (i == JavaTokenType.MINUS ||
i == JavaTokenType.ASTERISK ||
i == JavaTokenType.DIV ||
i == JavaTokenType.PERC ||
i == JavaTokenType.LT ||
i == JavaTokenType.GT ||
i == JavaTokenType.LE ||
i == JavaTokenType.GE) {
if (op == JavaTokenType.MINUS ||
op == JavaTokenType.ASTERISK ||
op == JavaTokenType.DIV ||
op == JavaTokenType.PERC ||
op == JavaTokenType.LT ||
op == JavaTokenType.GT ||
op == JavaTokenType.LE ||
op == JavaTokenType.GE) {
if (anotherType != null) {
myResult.add(createInfoImpl(PsiType.DOUBLE, anotherType));
}
}
else if (i == JavaTokenType.PLUS) {
else if (op == JavaTokenType.PLUS) {
if (anotherType == null || anotherType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
PsiClassType objectType = PsiType.getJavaLangObject(expr.getManager(), expr.getResolveScope());
myResult.add(createInfoImpl(objectType, anotherType != null ? anotherType : objectType));
@@ -690,18 +696,18 @@ public class ExpectedTypesProvider {
myResult.add(createInfoImpl(PsiType.DOUBLE, anotherType));
}
}
else if (i == JavaTokenType.EQEQ || i == JavaTokenType.NE) {
else if (op == JavaTokenType.EQEQ || op == JavaTokenType.NE) {
ContainerUtil.addIfNotNull(myResult, getEqualsType(anotherExpr));
}
else if (i == JavaTokenType.LTLT || i == JavaTokenType.GTGT || i == JavaTokenType.GTGTGT) {
else if (op == JavaTokenType.LTLT || op == JavaTokenType.GTGT || op == JavaTokenType.GTGTGT) {
if (anotherType != null) {
myResult.add(createInfoImpl(PsiType.LONG, ExpectedTypeInfo.TYPE_BETWEEN, PsiType.SHORT, TailType.NONE));
}
}
else if (i == JavaTokenType.OROR || i == JavaTokenType.ANDAND) {
else if (op == JavaTokenType.OROR || op == JavaTokenType.ANDAND) {
myResult.add(createInfoImpl(PsiType.BOOLEAN, ExpectedTypeInfo.TYPE_STRICTLY, PsiType.BOOLEAN, TailType.NONE));
}
else if (i == JavaTokenType.OR || i == JavaTokenType.XOR || i == JavaTokenType.AND) {
else if (op == JavaTokenType.OR || op == JavaTokenType.XOR || op == JavaTokenType.AND) {
if (anotherType != null) {
ExpectedTypeInfoImpl info;
if (PsiType.BOOLEAN.equals(anotherType)) {

4
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
View File

@@ -804,9 +804,7 @@ public class CreateFromUsageUtils {
PsiType[] types = ExpectedTypesProvider.processExpectedTypes(expectedTypes, visitor, manager.getProject());
if (types.length == 0) {
return allowVoidType
? new PsiType[]{PsiType.VOID}
: new PsiType[]{PsiType.getJavaLangObject(manager, resolveScope)};
return Arrays.stream(expectedTypes).map(type -> type.getType()).toArray(PsiType[]::new);
}
return types;

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalFromUsage/afterNothingFoundByExpectedMethod.java Normal file
View File

@@ -0,0 +1,8 @@
// "Create local variable 'a'" "true"
class C {
void foo(Foo f) {
Foo a = f;
if (a != null && a.foo()) {}
}
}
class Foo {}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalFromUsage/beforeNothingFoundByExpectedMethod.java Normal file
View File

@@ -0,0 +1,8 @@
// "Create local variable 'a'" "true"
class C {
void foo(Foo f) {
<caret>a = f;
if (a != null && a.foo()) {}
}
}
class Foo {}