Allow blank lines inserted before comments.

Previously, blank lines could only be emitted before comments if they were there in the input. This was irrespective of BlankLineWanted.YES hints in the OpBuilder.

These hints are already being set by some paths in GJF, so now that they're respected, blank lines will be added to some existing files.

Eval in unknown commit

PiperOrigin-RevId: 514817708

core/src/main/java/com/google/googlejavaformat/java/JavaOutput.java

@@ -111,7 +111,7 @@ public void append(String text, Range<Integer> range) {
        * there's a blank line here and it's a comment.
        */
       BlankLineWanted wanted = blankLines.getOrDefault(lastK, BlankLineWanted.NO);
-      if (isComment(text) ? sawNewlines : wanted.wanted().orElse(sawNewlines)) {
+      if ((sawNewlines && isComment(text)) || wanted.wanted().orElse(sawNewlines)) {
         ++newlinesPending;
       }
     }

core/src/test/java/com/google/googlejavaformat/java/PartialFormattingTest.java

@@ -679,6 +679,7 @@ public void noTokensOnLine() throws Exception {
     String input =
         lines(
             "    package com.google.googlejavaformat.java;",
+            "",
             "/*",
             " * Copyright 2015 Google Inc.",
             " *",

core/src/test/resources/com/google/googlejavaformat/java/testdata/B27246427.output

@@ -6,6 +6,7 @@ enum TrailingComment {
 
   /** a */
   Object a;
+
   /** b */
   Object b;
 }

core/src/test/resources/com/google/googlejavaformat/java/testdata/Fields.input

@@ -1,5 +1,12 @@
 class Fields {
 
+  int a = 1;
+  int b = 1;
+
+  int c = 1;
+  /** Javadoc */
+  int d = 1;
+
   int x = 1;
 
   int y = 1;

core/src/test/resources/com/google/googlejavaformat/java/testdata/Fields.output

@@ -1,5 +1,13 @@
 class Fields {
 
+  int a = 1;
+  int b = 1;
+
+  int c = 1;
+
+  /** Javadoc */
+  int d = 1;
+
   int x = 1;
 
   int y = 1;