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

teach "Duplicate condition in 'if' statement" inspection about polyadic expressions

Browse Source
This commit is contained in:
Bas Leijdekkers
2013-03-28 11:37:31 +01:00
parent 967d55760d
commit 04bd75efdd
5 changed files with 91 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DuplicateConditionInspection.java
+29 -44
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2007 Dave Griffith, Bas Leijdekkers
* Copyright 2003-2013 Dave Griffith, Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,30 +42,25 @@ public class DuplicateConditionInspection extends BaseInspection {
@NotNull
public String getDisplayName() {
return InspectionGadgetsBundle.message(
"duplicate.condition.display.name");
return InspectionGadgetsBundle.message("duplicate.condition.display.name");
}
@NotNull
protected String buildErrorString(Object... infos) {
return InspectionGadgetsBundle.message(
"duplicate.condition.problem.descriptor");
return InspectionGadgetsBundle.message("duplicate.condition.problem.descriptor");
}
@Nullable
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(
InspectionGadgetsBundle.message(
"duplicate.condition.ignore.method.calls.option"),
this, "ignoreMethodCalls");
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("duplicate.condition.ignore.method.calls.option"),
this, "ignoreMethodCalls");
}
public BaseInspectionVisitor buildVisitor() {
return new DuplicateConditionVisitor();
}
private class DuplicateConditionVisitor
extends BaseInspectionVisitor {
private class DuplicateConditionVisitor extends BaseInspectionVisitor {
@Override
public void visitIfStatement(@NotNull PsiIfStatement statement) {
@@ -84,8 +79,7 @@ public class DuplicateConditionInspection extends BaseInspection {
if (numConditions < 2) {
return;
}
final PsiExpression[] conditionArray =
conditions.toArray(new PsiExpression[numConditions]);
final PsiExpression[] conditionArray = conditions.toArray(new PsiExpression[numConditions]);
final boolean[] matched = new boolean[conditionArray.length];
Arrays.fill(matched, false);
for (int i = 0; i < conditionArray.length; i++) {
@@ -98,60 +92,51 @@ public class DuplicateConditionInspection extends BaseInspection {
continue;
}
final PsiExpression testCondition = conditionArray[j];
final boolean areEquivalent =
EquivalenceChecker.expressionsAreEquivalent(
condition, testCondition);
final boolean areEquivalent = EquivalenceChecker.expressionsAreEquivalent(condition, testCondition);
if (areEquivalent) {
if (!ignoreMethodCalls || !containsMethodCallExpression(testCondition)) {
registerError(testCondition);
if (!matched[i]) {
registerError(condition);
}
}
matched[i] = true;
matched[j] = true;
if (ignoreMethodCalls &&
containsMethodCallExpression(testCondition)) {
break;
}
registerError(testCondition);
if (!matched[i]) {
registerError(condition);
}
}
}
}
}
private void collectConditionsForIfStatement(
PsiIfStatement statement, Set<PsiExpression> conditions, int depth) {
if (depth > LIMIT_DEPTH) return;
private void collectConditionsForIfStatement(PsiIfStatement statement, Set<PsiExpression> conditions, int depth) {
if (depth > LIMIT_DEPTH) {
return;
}
final PsiExpression condition = statement.getCondition();
collectConditionsForExpression(condition, conditions);
final PsiStatement branch = statement.getElseBranch();
if (branch instanceof PsiIfStatement) {
collectConditionsForIfStatement((PsiIfStatement)branch,
conditions, depth + 1);
collectConditionsForIfStatement((PsiIfStatement)branch, conditions, depth + 1);
}
}
private void collectConditionsForExpression(
PsiExpression condition, Set<PsiExpression> conditions) {
private void collectConditionsForExpression(PsiExpression condition, Set<PsiExpression> conditions) {
if (condition == null) {
return;
}
if (condition instanceof PsiParenthesizedExpression) {
final PsiParenthesizedExpression parenthesizedExpression =
(PsiParenthesizedExpression)condition;
final PsiExpression contents =
parenthesizedExpression.getExpression();
final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)condition;
final PsiExpression contents = parenthesizedExpression.getExpression();
collectConditionsForExpression(contents, conditions);
return;
}
if (condition instanceof PsiBinaryExpression) {
final PsiBinaryExpression binaryExpression =
(PsiBinaryExpression)condition;
final IElementType tokenType = binaryExpression.getOperationTokenType();
if (condition instanceof PsiPolyadicExpression) {
final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)condition;
final IElementType tokenType = polyadicExpression.getOperationTokenType();
if (JavaTokenType.OROR.equals(tokenType)) {
final PsiExpression lhs = binaryExpression.getLOperand();
collectConditionsForExpression(lhs, conditions);
final PsiExpression rhs = binaryExpression.getROperand();
collectConditionsForExpression(rhs, conditions);
final PsiExpression[] operands = polyadicExpression.getOperands();
for (PsiExpression operand : operands) {
collectConditionsForExpression(operand, conditions);
}
return;
}
}
plugins/InspectionGadgets/src/inspectionDescriptions/DuplicateCondition.html
+3
View File
@@ -5,6 +5,9 @@ Reports on any duplicate conditions among different branches of an
desired semantics, duplicate conditions usually represent programmer oversight.
<!-- tooltip end -->
<p>
Use the checkbox below to let this inspection ignore conditions containing method calls. Some method calls may return a different value
on an identical invocation.
<p>
<small>Powered by InspectionGadgets</small>
</body>
</html>
plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/duplicate_condition/DuplicateCondition.java
+12
View File
@@ -0,0 +1,12 @@
package com.siyeh.igtest.controlflow.duplicate_condition;
public class DuplicateCondition {
void x(boolean b) {
if (b || b || b ) {
} else if (b) {
} else if (b) {}
}
}
plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/duplicate_condition/expected.xml
+37
View File
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<problems>
<problem>
<file>DuplicateCondition.java</file>
<line>6</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Duplicate condition in 'if' statement</problem_class>
<description>Duplicate condition &lt;code&gt;b&lt;/code&gt; #loc</description>
</problem>
<problem>
<file>DuplicateCondition.java</file>
<line>6</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Duplicate condition in 'if' statement</problem_class>
<description>Duplicate condition &lt;code&gt;b&lt;/code&gt; #loc</description>
</problem>
<problem>
<file>DuplicateCondition.java</file>
<line>8</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Duplicate condition in 'if' statement</problem_class>
<description>Duplicate condition &lt;code&gt;b&lt;/code&gt; #loc</description>
</problem>
<problem>
<file>DuplicateCondition.java</file>
<line>6</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Duplicate condition in 'if' statement</problem_class>
<description>Duplicate condition &lt;code&gt;b&lt;/code&gt; #loc</description>
</problem>
<problem>
<file>DuplicateCondition.java</file>
<line>10</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Duplicate condition in 'if' statement</problem_class>
<description>Duplicate condition &lt;code&gt;b&lt;/code&gt; #loc</description>
</problem>
</problems>
plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/DuplicateConditionInspectionTest.java
+10
View File
@@ -0,0 +1,10 @@
package com.siyeh.ig.controlflow;
import com.siyeh.ig.IGInspectionTestCase;
public class DuplicateConditionInspectionTest extends IGInspectionTestCase {
public void test() throws Exception {
doTest("com/siyeh/igtest/controlflow/duplicate_condition", new DuplicateConditionInspection());
}
}