Skip to content

Write BlockQuote rather than Blockquote everywhere. #1418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Jul 25, 2026
Merged

Write BlockQuote rather than Blockquote everywhere. #1418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import com.google.common.collect.ImmutableList;
import com.google.googlejavaformat.java.javadoc.JavadocLexer.LexException;
import com.google.googlejavaformat.java.javadoc.Token.BeginJavadoc;
import com.google.googlejavaformat.java.javadoc.Token.BlockquoteCloseTag;
import com.google.googlejavaformat.java.javadoc.Token.BlockquoteOpenTag;
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 @@ -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.writeBlockquoteOpen(t);
case BlockquoteCloseTag t -> output.writeBlockquoteClose(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
8 changes: 4 additions & 4 deletions core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.PeekingIterator;
import com.google.googlejavaformat.java.javadoc.Token.BeginJavadoc;
import com.google.googlejavaformat.java.javadoc.Token.BlockquoteCloseTag;
import com.google.googlejavaformat.java.javadoc.Token.BlockquoteOpenTag;
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 @@ -350,9 +350,9 @@ private Function<String, Token> consumeToken() throws LexException {
} else if (input.tryConsumeRegex(LIST_ITEM_CLOSE_PATTERN)) {
return ListItemCloseTag::new;
} else if (input.tryConsumeRegex(BLOCKQUOTE_OPEN_PATTERN)) {
return BlockquoteOpenTag::new;
return BlockQuoteOpenTag::new;
} else if (input.tryConsumeRegex(BLOCKQUOTE_CLOSE_PATTERN)) {
return BlockquoteCloseTag::new;
return BlockQuoteCloseTag::new;
} else if (input.tryConsumeRegex(HEADER_OPEN_PATTERN)) {
return HeaderOpenTag::new;
} else if (input.tryConsumeRegex(HEADER_CLOSE_PATTERN)) {
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +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.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 @@ -257,15 +257,15 @@ void writeParagraphOpen(Token token) {
writeToken(token);
}

void writeBlockquoteOpen(BlockquoteOpenTag token) {
void writeBlockQuoteOpen(BlockQuoteOpenTag token) {
requestBlankLine();

writeToken(token);

requestNewline();
}

void writeBlockquoteClose(BlockquoteCloseTag token) {
void writeBlockQuoteClose(BlockQuoteCloseTag token) {
requestNewline();

writeToken(token);
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/google/googlejavaformat/java/javadoc/Token.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ record ParagraphOpenTag(String value) implements Token, StartOfLineToken {}

record ParagraphCloseTag(String value) implements Token {}

record BlockquoteOpenTag(String value) implements Token {}
record BlockQuoteOpenTag(String value) implements Token {}

record BlockquoteCloseTag(String value) implements Token {}
record BlockQuoteCloseTag(String value) implements Token {}

record PreOpenTag(String value) implements Token {}

Expand Down