From 4b95f33697750ed910d59830fc9c649f094d88f8 Mon Sep 17 00:00:00 2001 From: Michal Kordas Date: Sun, 30 Aug 2015 21:58:31 +0200 Subject: [PATCH] Issue #1555: Collapse if statement Fixes `IfStatementWithIdenticalBranches` inspection violation. Description: >Reports if statements with identical "then" and else branches. Such statements are almost certainly programmer error. --- .../checkstyle/checks/indentation/MethodCallHandler.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.java index d34498446..52fd0d3e7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.java @@ -49,14 +49,12 @@ public class MethodCallHandler extends AbstractExpressionHandler { if (getParent() instanceof MethodCallHandler) { final MethodCallHandler container = (MethodCallHandler) getParent(); - if (areOnSameLine(container.getMainAst(), getMainAst())) { + if (areOnSameLine(container.getMainAst(), getMainAst()) + || isChainedMethodCallWrapped()) { indentLevel = container.getLevel(); } // we should increase indentation only if this is the first // chained method call which was moved to the next line - else if (isChainedMethodCallWrapped()) { - indentLevel = container.getLevel(); - } else { indentLevel = new IndentLevel(container.getLevel(), getBasicOffset()); }