Keep line break after end of line comment in modifier list (IDEA-129964)

java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java

@@ -1129,7 +1129,12 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
 
   @Override
   public void visitModifierList(PsiModifierList list) {
-    myResult = Spacing.createSpacing(1, 1, 0, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+    if (myType1 == JavaTokenType.END_OF_LINE_COMMENT) {
+      myResult = Spacing.createSpacing(0, Integer.MAX_VALUE, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+    }
+    else {
+      myResult = Spacing.createSpacing(1, 1, 0, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+    }
   }
 
   @Override

java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterSpaceTest.java

@@ -589,4 +589,20 @@ public class JavaFormatterSpaceTest extends AbstractJavaFormatterTest {
       "};"
     );
   }
+  
+  public void testCommentBetweenAnnotationAndModifierList() {
+    getSettings().KEEP_LINE_BREAKS = false;
+    getSettings().KEEP_FIRST_COLUMN_COMMENT = false;
+    doClassTest("@Override\n" +
+                "//FIX me this stupid stuff\n" +
+                "public void run() {\n" +
+                "        int a = 2;\n" +
+                "}",
+
+                "@Override\n" +
+                "//FIX me this stupid stuff\n" +
+                "public void run() {\n" +
+                "    int a = 2;\n" +
+                "}");
+  }
 }