Issue #3116: removed requirement right curlies must be first on line (#3222)

2 files changed, 1 insertions, 19 deletions

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java
index 3deac47ce..49c0f226f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java
@@ -78,11 +78,6 @@ public class ArrayInitHandler extends BlockParentHandler {
     }
 
     @Override
-    protected boolean shouldStartWithRCurly() {
-        return false;
-    }
-
-    @Override
     protected boolean canChildrenBeNested() {
         return true;
     }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java
index e86f50177..3f55957cd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java
@@ -171,15 +171,6 @@ public class BlockParentHandler extends AbstractExpressionHandler {
     }
 
     /**
-     * Determines if the right curly brace must be at the start of the line.
-     *
-     * @return true
-     */
-    protected boolean shouldStartWithRCurly() {
-        return true;
-    }
-
-    /**
      * Determines if child elements within the expression may be nested.
      *
      * @return false
@@ -192,15 +183,11 @@ public class BlockParentHandler extends AbstractExpressionHandler {
      * Check the indentation of the right curly brace.
      */
     protected void checkRCurly() {
-        // the rcurly can either be at the correct indentation, or
-        // on the same line as the lcurly
-        final DetailAST lcurly = getLCurly();
         final DetailAST rcurly = getRCurly();
         final int rcurlyPos = expandedTabsColumnNo(rcurly);
 
         if (!curlyIndent().isAcceptable(rcurlyPos)
-                && (shouldStartWithRCurly() || isOnStartOfLine(rcurly))
-                && !areOnSameLine(rcurly, lcurly)) {
+                && isOnStartOfLine(rcurly)) {
             logError(rcurly, "rcurly", rcurlyPos, curlyIndent());
         }
     }