From d4a862ea091fc7b74f34a13fcae8143239d9d4b9 Mon Sep 17 00:00:00 2001 From: Michal Kordas Date: Sun, 19 Jul 2015 20:12:49 +0200 Subject: [PATCH] Remove dead code from NewHandler in Indentation check. #1270 --- pom.xml | 1 - .../checks/indentation/NewHandler.java | 27 ------------------- 2 files changed, 28 deletions(-) diff --git a/pom.xml b/pom.xml index 08cb4ef20..66b07cac0 100644 --- a/pom.xml +++ b/pom.xml @@ -1160,7 +1160,6 @@ .*.checks.indentation.LineWrappingHandler8795 .*.checks.indentation.MethodCallLineWrapHandler00 .*.checks.indentation.MethodDefHandler87100 - .*.checks.indentation.NewHandler8377 .*.checks.indentation.ObjectBlockHandler75100 .*.checks.indentation.SynchronizedHandler100100 diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.java index cc6b39410..28110a340 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.java @@ -50,34 +50,7 @@ public class NewHandler extends AbstractExpressionHandler { } final DetailAST lparen = getMainAst().findFirstToken(TokenTypes.LPAREN); - final DetailAST rparen = getMainAst().findFirstToken(TokenTypes.RPAREN); checkLParen(lparen); - - if (rparen == null || lparen == null - || rparen.getLineNo() == lparen.getLineNo()) { - return; - } - - if (getMainAst().getType() != TokenTypes.OBJBLOCK) { - return; - } - - // if this method name is on the same line as a containing - // method, don't indent, this allows expressions like: - // method("my str" + method2( - // "my str2")); - // as well as - // method("my str" + - // method2( - // "my str2")); - // - - checkExpressionSubtree( - getMainAst().findFirstToken(TokenTypes.ELIST), - new IndentLevel(getLevel(), getBasicOffset()), - false, true); - - checkRParen(lparen, rparen); } @Override