Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ private static String render(List<Token> input, int blockIndent, boolean classic
case HeaderOpenTag t -> output.writeHeaderOpen(t);
case HeaderCloseTag t -> output.writeHeaderClose(t);
case ParagraphOpenTag t -> output.writeParagraphOpen(standardizePToken(t));
case BlockquoteOpenTag t -> output.writeBlockquoteOpenOrClose(t);
case BlockquoteCloseTag t -> output.writeBlockquoteOpenOrClose(t);
case BlockquoteOpenTag t -> output.writeBlockquoteOpen(t);
case BlockquoteCloseTag t -> output.writeBlockquoteClose(t);
case PreOpenTag t -> output.writePreOpen(t);
case PreCloseTag t -> output.writePreClose(t);
case CodeOpenTag t -> output.writeCodeOpen(t);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import static com.google.googlejavaformat.java.javadoc.JavadocWriter.RequestedWhitespace.NONE;
import static com.google.googlejavaformat.java.javadoc.JavadocWriter.RequestedWhitespace.WHITESPACE;

import com.google.googlejavaformat.java.javadoc.Token.BlockquoteCloseTag;
import com.google.googlejavaformat.java.javadoc.Token.BlockquoteOpenTag;
import com.google.googlejavaformat.java.javadoc.Token.BrTag;
import com.google.googlejavaformat.java.javadoc.Token.CodeCloseTag;
import com.google.googlejavaformat.java.javadoc.Token.CodeOpenTag;
Expand Down Expand Up @@ -259,13 +261,23 @@ void writeParagraphOpen(Token token) {
writeToken(token);
}

void writeBlockquoteOpenOrClose(Token token) {
void writeBlockquoteOpen(BlockquoteOpenTag token) {
if (wroteAnythingSignificant) {
requestBlankLine();
}

writeToken(token);

requestNewline();
}

void writeBlockquoteClose(BlockquoteCloseTag token) {
if (wroteAnythingSignificant) {
requestNewline();
}

writeToken(token);

requestBlankLine();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,6 @@ class Test {}\
* <blockquote>
*
* <p>def
*
* </blockquote>
*
* ghi
Expand Down Expand Up @@ -2178,9 +2177,7 @@ class Test {}
String expected =
"""
/// <blockquote>
///
/// line 1 line 2
///
/// </blockquote>
class Test {}
""";
Expand Down
Loading