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

IDEA-75717 ("Referenced checked for null not used inside if" false positive)

Browse Source
This commit is contained in:
Bas Leijdekkers
2013-11-08 17:27:18 +01:00
parent 795357c5a1
commit 201c7b5512
4 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
+2 -1
View File
@@ -1731,7 +1731,8 @@ field.may.be.final.display.name=Field may be 'final'
field.may.be.final.problem.descriptor=Field <code>#ref</code> may be 'final' #loc
cast.that.loses.precision.option=Ignore casts from int to char
variable.not.used.inside.if.display.name=Reference checked for 'null' is not used inside 'if'
variable.not.used.inside.if.problem.descriptor=<code>#ref</code> is not used inside if #loc
variable.not.used.inside.if.problem.descriptor=<code>#ref</code> checked for 'null' is not used inside 'if' #loc
variable.not.used.inside.conditional.problem.descriptor=<code>#ref</code> checked for 'null' is not used inside conditional #loc
if.may.be.conditional.display.name='if' statement could be replaced with conditional expression
if.may.be.conditional.problem.descriptor=<code>#ref</code> could be replaced with conditional expression #loc
if.may.be.conditional.quickfix=Replace with conditional expression
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/VariableNotUsedInsideIfInspection.java
+27 -18
View File
@@ -31,15 +31,19 @@ public class VariableNotUsedInsideIfInspection extends BaseInspection {
@Nls
@NotNull
public String getDisplayName() {
return InspectionGadgetsBundle.message(
"variable.not.used.inside.if.display.name");
return InspectionGadgetsBundle.message("variable.not.used.inside.if.display.name");
}
@Override
@NotNull
protected String buildErrorString(Object... infos) {
return InspectionGadgetsBundle.message(
"variable.not.used.inside.if.problem.descriptor");
final boolean isIf = ((Boolean)infos[0]).booleanValue();
if (isIf) {
return InspectionGadgetsBundle.message("variable.not.used.inside.if.problem.descriptor");
}
else {
return InspectionGadgetsBundle.message("variable.not.used.inside.conditional.problem.descriptor");
}
}
@Override
@@ -63,10 +67,14 @@ public class VariableNotUsedInsideIfInspection extends BaseInspection {
}
final IElementType tokenType = binaryExpression.getOperationTokenType();
if (tokenType == JavaTokenType.EQEQ) {
checkVariableUsage(referenceExpression, expression.getThenExpression(), expression.getElseExpression());
if (checkVariableUsage(referenceExpression, expression.getThenExpression(), expression.getElseExpression())) {
registerError(referenceExpression, Boolean.FALSE);
}
}
else if (tokenType == JavaTokenType.NE) {
checkVariableUsage(referenceExpression, expression.getElseExpression(), expression.getThenExpression());
if (checkVariableUsage(referenceExpression, expression.getElseExpression(), expression.getThenExpression())) {
registerError(referenceExpression, Boolean.FALSE);
}
}
}
@@ -84,29 +92,30 @@ public class VariableNotUsedInsideIfInspection extends BaseInspection {
}
final IElementType tokenType = binaryExpression.getOperationTokenType();
if (tokenType == JavaTokenType.EQEQ) {
checkVariableUsage(referenceExpression, statement.getThenBranch(), statement.getElseBranch());
if (checkVariableUsage(referenceExpression, statement.getThenBranch(), statement.getElseBranch())) {
registerError(referenceExpression, Boolean.TRUE);
}
}
else if (tokenType == JavaTokenType.NE) {
checkVariableUsage(referenceExpression, statement.getElseBranch(), statement.getThenBranch());
if (checkVariableUsage(referenceExpression, statement.getElseBranch(), statement.getThenBranch())) {
registerError(referenceExpression, Boolean.TRUE);
}
}
}
private void checkVariableUsage(PsiReferenceExpression referenceExpression, PsiElement thenContext, PsiElement elseContext) {
if (thenContext == null) {
return;
}
private boolean checkVariableUsage(PsiReferenceExpression referenceExpression, PsiElement thenContext, PsiElement elseContext) {
final PsiElement target = referenceExpression.resolve();
if (!(target instanceof PsiVariable)) {
return;
return false;
}
final PsiVariable variable = (PsiVariable)target;
if (contextExits(thenContext) || VariableAccessUtils.variableIsAssigned(variable, thenContext)) {
return;
if (thenContext != null && (contextExits(thenContext) || VariableAccessUtils.variableIsAssigned(variable, thenContext))) {
return false;
}
if (elseContext != null && (contextExits(elseContext) || VariableAccessUtils.variableIsUsed(variable, elseContext))) {
return;
if (elseContext == null || VariableAccessUtils.variableIsUsed(variable, elseContext)) {
return false;
}
registerError(referenceExpression);
return true;
}
private static PsiReferenceExpression extractVariableReference(PsiBinaryExpression expression) {
plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/variable_not_used_inside_if/VariableNotUsedInsideIf.java
+22 -3
View File
@@ -27,10 +27,10 @@ public class VariableNotUsedInsideIf {
}
void bat(String s) {
if (s == null) {
if (s != null) {
System.out.println();
}
if (s != null) {
if (s == null) {
} else {
@@ -38,8 +38,27 @@ public class VariableNotUsedInsideIf {
}
void money(String s) {
if ((s == null)) {
if (((s) != (null))) {
System.out.println();
}
}
void x(Integer x){
if (x != null) {
System.out.println();
}
}
int x(Integer x, int y){
if (x != null) return y;//oops, wrong one
return y;
}
int conditional(Integer x) {
return x == null ? 1 : someValue();
}
private int someValue() {
return 0;
}
}
plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/variable_not_used_inside_if/expected.xml
+21
View File
@@ -20,4 +20,25 @@
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Reference checked for 'null' is not used inside 'if'</problem_class>
<description>&lt;code&gt;s&lt;/code&gt; is not used inside if #loc</description>
</problem>
<problem>
<file>VariableNotUsedInsideIf.java</file>
<line>47</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Reference checked for 'null' is not used inside 'if'</problem_class>
<description>&lt;code&gt;x&lt;/code&gt; checked for 'null' is not used inside 'if' #loc</description>
</problem>
<problem>
<file>VariableNotUsedInsideIf.java</file>
<line>53</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Reference checked for 'null' is not used inside 'if'</problem_class>
<description>&lt;code&gt;x&lt;/code&gt; checked for 'null' is not used inside 'if' #loc</description>
</problem>
<problem>
<file>VariableNotUsedInsideIf.java</file>
<line>58</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Reference checked for 'null' is not used inside 'if'</problem_class>
<description>&lt;code&gt;x&lt;/code&gt; checked for 'null' is not used inside conditional #loc</description>
</problem>
</problems>