Issue #3220: CommentsIndentation: allow upper comments for following block at multi-block structures (#3270)

1 files changed, 131 insertions, 0 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationInMultiblockStructures.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationInMultiblockStructures.java
new file mode 100644
index 000000000..ef5388451
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationInMultiblockStructures.java
@@ -0,0 +1,131 @@
+package com.puppycrawl.tools.checkstyle.checks.indentation;
+
+public class InputCommentsIndentationInMultiblockStructures {
+    void foo() {
+        if (true) {
+            assert true;
+        // comment for else
+        } else {}
+
+        if (true) {
+            assert true;
+        // violation
+        }
+        else {}
+
+        if (true) {
+            assert true;
+                // violation
+        } else {}
+
+        if (true) {
+            assert true;
+// violation
+        } else {}
+
+        try {
+            assert true;
+        // comment for catch
+        } catch (Exception ex) {}
+
+        try {
+            assert true;
+        // violation
+        }
+        catch (Exception ex) {}
+
+        try {
+            assert true;
+// violation
+        } catch (Exception ex) {}
+
+        try {
+            assert true;
+                // violation
+        } catch (Exception ex) {}
+
+        try {
+            assert true;
+        // comment for finally
+        } finally {}
+
+        try {
+            assert true;
+        // violation
+        }
+        finally {}
+
+        try {
+            assert true;
+// violation
+        } finally {}
+
+        try {
+            assert true;
+                // violation
+        } finally {}
+
+        try {} catch (Exception ex) {
+            assert true;
+        // comment for finally
+        } finally {}
+
+        try {} catch (Exception ex) {
+            assert true;
+        // violation
+        }
+        finally {}
+
+        try {} catch (Exception ex) {
+            assert true;
+// violation
+        } finally {}
+
+        try {} catch (Exception ex) {
+            assert true;
+                // violation
+        } finally {}
+
+        try {} catch (ClassCastException ex) {
+            assert true;
+        // comment for catch
+        } catch (Exception ex) {}
+
+        try {} catch (ClassCastException ex) {
+            assert true;
+        // violation
+        }
+        catch (Exception ex) {}
+
+        try {} catch (ClassCastException ex) {
+            assert true;
+// violation
+        } catch (Exception ex) {}
+
+        try {} catch (ClassCastException ex) {
+            assert true;
+                // violation
+        } catch (Exception ex) {}
+
+        do {
+            assert true;
+        // comment for while
+        } while (false);
+
+        do {
+            assert true;
+        // violation
+        }
+        while (false);
+
+        do {
+            assert true;
+                // violation
+        } while (false);
+
+        do {
+            assert true;
+// violation
+        } while (false);
+    }
+}