diff --git a/javascript-frontend/src/main/java/org/sonar/javascript/cfg/ControlFlowGraphBuilder.java b/javascript-frontend/src/main/java/org/sonar/javascript/cfg/ControlFlowGraphBuilder.java index 62ef242bc3c..1a7127fd9df 100644 --- a/javascript-frontend/src/main/java/org/sonar/javascript/cfg/ControlFlowGraphBuilder.java +++ b/javascript-frontend/src/main/java/org/sonar/javascript/cfg/ControlFlowGraphBuilder.java @@ -184,7 +184,6 @@ private void build(List trees) { private void build(Tree tree) { if (tree.is(Kind.EXPRESSION_STATEMENT)) { - currentBlock.addElement(tree); buildExpression(((ExpressionStatementTree) tree).expression()); } else if (tree.is(Kind.VARIABLE_STATEMENT)) { buildExpression(((VariableStatementTree) tree).declaration()); diff --git a/javascript-frontend/src/test/java/org/sonar/javascript/se/SeChecksDispatcherTest.java b/javascript-frontend/src/test/java/org/sonar/javascript/se/SeChecksDispatcherTest.java index e32e41096ad..0aef6fe89c0 100644 --- a/javascript-frontend/src/test/java/org/sonar/javascript/se/SeChecksDispatcherTest.java +++ b/javascript-frontend/src/test/java/org/sonar/javascript/se/SeChecksDispatcherTest.java @@ -41,13 +41,11 @@ public class SeChecksDispatcherTest { public void test() throws Exception { SeChecksDispatcher seChecksDispatcher = new SeChecksDispatcher(ImmutableList.of(new TestSeCheck())); List issues = seChecksDispatcher.scanFile(createContext(new File("src/test/resources/se/se_dispatcher_test.js"))); - assertThat(issues).hasSize(6); + assertThat(issues).hasSize(4); assertThat(((PreciseIssue) issues.get(0)).primaryLocation().message()).isEqualTo("Start of execution"); assertThat(((PreciseIssue) issues.get(1)).primaryLocation().message()).isEqualTo("before element"); assertThat(((PreciseIssue) issues.get(2)).primaryLocation().message()).isEqualTo("after element"); - assertThat(((PreciseIssue) issues.get(3)).primaryLocation().message()).isEqualTo("before element"); - assertThat(((PreciseIssue) issues.get(4)).primaryLocation().message()).isEqualTo("after element"); - assertThat(((PreciseIssue) issues.get(5)).primaryLocation().message()).isEqualTo("End of execution"); + assertThat(((PreciseIssue) issues.get(3)).primaryLocation().message()).isEqualTo("End of execution"); } private class TestSeCheck extends SeCheck {