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

retrieve type from binary comparisons to detect applicable constants (IDEA-165557)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-12-16 13:44:34 +01:00
parent 12e86f8f1d
commit d7f10b93e1
3 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java
View File

@@ -78,6 +78,17 @@ abstract class StaticMembersProcessor<T extends PsiMember & PsiDocCommentOwner>
return ((PsiAssignmentExpression)parent).getLExpression().getType();
}
}
else if (parent instanceof PsiBinaryExpression && JavaTokenType.EQEQ.equals(((PsiBinaryExpression)parent).getOperationTokenType())) {
if (myPlace.equals(PsiUtil.skipParenthesizedExprDown(((PsiBinaryExpression)parent).getROperand()))) {
return ((PsiBinaryExpression)parent).getLOperand().getType();
}
if (myPlace.equals(PsiUtil.skipParenthesizedExprDown(((PsiBinaryExpression)parent).getLOperand()))) {
PsiExpression rOperand = ((PsiBinaryExpression)parent).getROperand();
if (rOperand != null) {
return rOperand.getType();
}
}
}
else if (parent instanceof PsiReturnStatement) {
return PsiTypesUtil.getMethodReturnType(parent);
}

17
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportConstant/afterConstantInComparison.java Normal file
View File

@@ -0,0 +1,17 @@
// "Import static constant 'foo.B.aaaaaaa'" "true"
package foo;
import static foo.B.aaaaaaa;
public class X {
{
if (1 == aaaaaaa);
}
}
class B {
public static Integer aaaaaaa = 1;
}
class B1 {
public static String aaaaaaa = "";
}

15
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportConstant/beforeConstantInComparison.java Normal file
View File

@@ -0,0 +1,15 @@
// "Import static constant 'foo.B.aaaaaaa'" "true"
package foo;
public class X {
{
if (1 == <caret>aaaaaaa);
}
}
class B {
public static Integer aaaaaaa = 1;
}
class B1 {
public static String aaaaaaa = "";
}