From 0f8ae69df761c07b00ccc430ed457729e4aec71a Mon Sep 17 00:00:00 2001 From: Andrei Paikin Date: Mon, 17 Oct 2022 17:35:45 +0300 Subject: [PATCH] Issue #12291: fix bound condition in EmptyForInitializerPadCheck --- .../checks/whitespace/EmptyForInitializerPadCheck.java | 2 +- .../InputEmptyForInitializerPadDefaultConfig.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java index 6fc77b0e2f7..0d568b60e9f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java @@ -152,7 +152,7 @@ public void visitToken(DetailAST ast) { final int[] line = getLineCodePoints(lineIdx); final int before = ast.getColumnNo() - 1; // don't check if semi at beginning of line - if (!CodePointUtil.hasWhitespaceBefore(before, line)) { + if (ast.getColumnNo() > 0 && !CodePointUtil.hasWhitespaceBefore(before, line)) { if (option == PadOption.NOSPACE && CommonUtil.isCodePointWhitespace(line, before)) { log(ast, MSG_PRECEDED, SEMICOLON); diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/InputEmptyForInitializerPadDefaultConfig.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/InputEmptyForInitializerPadDefaultConfig.java index aa6daf1becf..f3568bb0dd9 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/InputEmptyForInitializerPadDefaultConfig.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/InputEmptyForInitializerPadDefaultConfig.java @@ -58,4 +58,9 @@ void method2() ;; ) { } } + + void method3() { +for ( +;;) {} + } }