1 files changed, 32 insertions, 0 deletions
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBlankLinesTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBlankLinesTest.java
index bf11a587f2c3..fe005a84db3f 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBlankLinesTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBlankLinesTest.java
@@ -400,4 +400,36 @@ public class JavaFormatterBlankLinesTest extends AbstractJavaFormatterTest {
       "}"
     );
   }
+
+  public void testIDEA126836() {
+    doTextTest(
+      "public class JavaClass {  // comment\n" +
+      "    public void doSomething() {\n" +
+      "                int a = 3;\n" +
+      "    }\n" +
+      "}",
+      "public class JavaClass {  // comment\n" +
+      "    public void doSomething() {\n" +
+      "        int a = 3;\n" +
+      "    }\n" +
+      "}"
+    );
+  }
+
+  public void testBlankLinesAfterClassHeaderWithComment() {
+    getSettings().BLANK_LINES_AFTER_CLASS_HEADER = 5;
+    doTextTest(
+      "public class JavaClass {  // comment\n" +
+      "    public void doSomething() {\n" +
+      "                int a = 3;\n" +
+      "    }\n" +
+      "}",
+      "public class JavaClass {  // comment\n" +
+      "\n\n\n\n\n" +
+      "    public void doSomething() {\n" +
+      "        int a = 3;\n" +
+      "    }\n" +
+      "}"
+    );
+  }
 }