Skip to content

Commit b291d95

Browse files
kluevergoogle-java-format Team
authored andcommitted
Fix duplicate blank lines before MOE end strip comment tag
Reset `requestedWhitespace` to `NONE` when entering `writeMoeEndStripComment` in `JavadocWriter` so that any requested whitespace (e.g., from a preceding Markdown fenced code block) does not flush extra blank lines after `writeLineBreakNoAutoIndent` has already emitted a line break. PiperOrigin-RevId: 964030265
1 parent c6c150d commit b291d95

2 files changed

Lines changed: 1 addition & 3 deletions

File tree

‎core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ void writeTableClose(TableCloseTag token) {
331331
}
332332

333333
void writeMoeEndStripComment(MoeEndStripComment token) {
334+
requestedWhitespace = NONE;
334335
writeLineBreakNoAutoIndent();
335336
output.append(indentForMoeEndStripComment);
336337

‎core/src/test/java/com/google/googlejavaformat/java/JavadocFormattingTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1897,7 +1897,6 @@ public void markdownMoeComments() {
18971897
class Test {}
18981898
"""
18991899
.replace("moe", "MOE");
1900-
// TODO(kak): Ideally the extra blank lines would not be inserted after the code block
19011900
String expected =
19021901
"""
19031902
/// This is the first line.
@@ -1908,8 +1907,6 @@ class Test {}
19081907
/// ```
19091908
/// this is a code block
19101909
/// ```
1911-
///
1912-
///
19131910
/// <!-- moe:end_intracomment_strip -->
19141911
class Test {}
19151912
"""

0 commit comments

Comments
 (0)