phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle boolean expressions on different statements

Browse Source
This commit is contained in:
Gwilym Kuiper
2020-02-18 16:59:12 +00:00
parent a4db0ea069
commit 0231350dea
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/metrics/impl/visitors/CognitiveComplexityVisitor.java
View File

@ -170,4 +170,19 @@ public class CognitiveComplexityVisitor extends ApexParserVisitorAdapter {
return super.visit(node, data);
}
@Override
public Object visit(ASTBlockStatement node, Object data) {
State state = (State) data;
for (ApexNode<?> child : node.children()) {
child.jjtAccept(this, data);
// This needs to happen because the current 'run' of boolean operations is terminated
// once we finish a statement.
state.booleanOperation(null);
}
return data;
}
}

8
pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/metrics/impl/xml/CognitiveComplexityTest.xml
View File

@ -293,13 +293,14 @@
<test-code>
<description>Boolean operators</description>
<expected-problems>5</expected-problems>
<expected-problems>6</expected-problems>
<expected-messages>
<message>'c__Foo#a(Integer)' has value 1.</message>
<message>'c__Foo#b(Integer)' has value 1.</message>
<message>'c__Foo#c(Integer)' has value 1.</message>
<message>'c__Foo#d(Boolean,Boolean,Boolean,Boolean,Boolean,Boolean)' has value 3.</message>
<message>'c__Foo#e(Boolean,Boolean,Boolean)' has value 2.</message>
<message>'c__Foo#f()' has value 2.</message>
</expected-messages>
<code>
<![CDATA[
@ -328,6 +329,11 @@
&& // +1
!(b && c); // +1
}
Boolean f() {
Boolean a = true && false; // +1
return a && true; // +1
}
}
]]>
</code>