Always break before javadoc comments ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=116389315
diff --git a/core/src/main/java/com/google/googlejavaformat/OpsBuilder.java b/core/src/main/java/com/google/googlejavaformat/OpsBuilder.java index 5ae9b4f..ff79289 100644 --- a/core/src/main/java/com/google/googlejavaformat/OpsBuilder.java +++ b/core/src/main/java/com/google/googlejavaformat/OpsBuilder.java
@@ -20,6 +20,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; +import com.google.googlejavaformat.Indent.Const; import com.google.googlejavaformat.Input.Tok; import com.google.googlejavaformat.Input.Token; import com.google.googlejavaformat.Output.BreakTag; @@ -454,13 +455,16 @@ for (Input.Tok tokAfter : token.getToksAfter()) { if (tokAfter.isComment()) { boolean breakAfter = - tokAfter.isSlashStarComment() - && tokenOp.breakAndIndentTrailingComment().isPresent(); + tokAfter.isJavadocComment() + || (tokAfter.isSlashStarComment() + && tokenOp.breakAndIndentTrailingComment().isPresent()); if (breakAfter) { tokOps.put( k + 1, Doc.Break.make( - Doc.FillMode.FORCED, "", tokenOp.breakAndIndentTrailingComment().get())); + Doc.FillMode.FORCED, + "", + tokenOp.breakAndIndentTrailingComment().or(Const.ZERO))); } else { tokOps.put(k + 1, SPACE); }
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B27246427.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B27246427.input new file mode 100644 index 0000000..bf4076d --- /dev/null +++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B27246427.input
@@ -0,0 +1,7 @@ +enum TrailingComment { + /** foo */ FOO, /** bar */ + BAR; + + /** a */ Object a; /** b */ + Object b; +}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B27246427.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B27246427.output new file mode 100644 index 0000000..b1e33e9 --- /dev/null +++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B27246427.output
@@ -0,0 +1,11 @@ +enum TrailingComment { + /** foo */ + FOO, + /** bar */ + BAR; + + /** a */ + Object a; + /** b */ + Object b; +}