Skip to content

Commit 8cb2394

Browse files
eamonnmcmanusgoogle-java-format Team
authored andcommitted
Write BlockQuote rather than Blockquote everywhere.
This is consistent with the [CommonMark API](https://javadoc.io/doc/org.commonmark/commonmark/latest/org.commonmark/org/commonmark/node/BlockQuote.html). PiperOrigin-RevId: 953910538
1 parent dc71a7c commit 8cb2394

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import com.google.common.collect.ImmutableList;
2525
import com.google.googlejavaformat.java.javadoc.JavadocLexer.LexException;
2626
import com.google.googlejavaformat.java.javadoc.Token.BeginJavadoc;
27-
import com.google.googlejavaformat.java.javadoc.Token.BlockquoteCloseTag;
28-
import com.google.googlejavaformat.java.javadoc.Token.BlockquoteOpenTag;
27+
import com.google.googlejavaformat.java.javadoc.Token.BlockQuoteCloseTag;
28+
import com.google.googlejavaformat.java.javadoc.Token.BlockQuoteOpenTag;
2929
import com.google.googlejavaformat.java.javadoc.Token.BrTag;
3030
import com.google.googlejavaformat.java.javadoc.Token.CodeCloseTag;
3131
import com.google.googlejavaformat.java.javadoc.Token.CodeOpenTag;
@@ -119,8 +119,8 @@ private static String render(List<Token> input, int blockIndent, boolean classic
119119
case HeaderOpenTag t -> output.writeHeaderOpen(t);
120120
case HeaderCloseTag t -> output.writeHeaderClose(t);
121121
case ParagraphOpenTag t -> output.writeParagraphOpen(standardizePToken(t));
122-
case BlockquoteOpenTag t -> output.writeBlockquoteOpen(t);
123-
case BlockquoteCloseTag t -> output.writeBlockquoteClose(t);
122+
case BlockQuoteOpenTag t -> output.writeBlockQuoteOpen(t);
123+
case BlockQuoteCloseTag t -> output.writeBlockQuoteClose(t);
124124
case PreOpenTag t -> output.writePreOpen(t);
125125
case PreCloseTag t -> output.writePreClose(t);
126126
case CodeOpenTag t -> output.writeCodeOpen(t);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import com.google.common.collect.ImmutableSet;
2929
import com.google.common.collect.PeekingIterator;
3030
import com.google.googlejavaformat.java.javadoc.Token.BeginJavadoc;
31-
import com.google.googlejavaformat.java.javadoc.Token.BlockquoteCloseTag;
32-
import com.google.googlejavaformat.java.javadoc.Token.BlockquoteOpenTag;
31+
import com.google.googlejavaformat.java.javadoc.Token.BlockQuoteCloseTag;
32+
import com.google.googlejavaformat.java.javadoc.Token.BlockQuoteOpenTag;
3333
import com.google.googlejavaformat.java.javadoc.Token.BrTag;
3434
import com.google.googlejavaformat.java.javadoc.Token.CodeCloseTag;
3535
import com.google.googlejavaformat.java.javadoc.Token.CodeOpenTag;
@@ -350,9 +350,9 @@ private Function<String, Token> consumeToken() throws LexException {
350350
} else if (input.tryConsumeRegex(LIST_ITEM_CLOSE_PATTERN)) {
351351
return ListItemCloseTag::new;
352352
} else if (input.tryConsumeRegex(BLOCKQUOTE_OPEN_PATTERN)) {
353-
return BlockquoteOpenTag::new;
353+
return BlockQuoteOpenTag::new;
354354
} else if (input.tryConsumeRegex(BLOCKQUOTE_CLOSE_PATTERN)) {
355-
return BlockquoteCloseTag::new;
355+
return BlockQuoteCloseTag::new;
356356
} else if (input.tryConsumeRegex(HEADER_OPEN_PATTERN)) {
357357
return HeaderOpenTag::new;
358358
} else if (input.tryConsumeRegex(HEADER_CLOSE_PATTERN)) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import static com.google.googlejavaformat.java.javadoc.JavadocWriter.RequestedWhitespace.NONE;
2424
import static com.google.googlejavaformat.java.javadoc.JavadocWriter.RequestedWhitespace.WHITESPACE;
2525

26-
import com.google.googlejavaformat.java.javadoc.Token.BlockquoteCloseTag;
27-
import com.google.googlejavaformat.java.javadoc.Token.BlockquoteOpenTag;
26+
import com.google.googlejavaformat.java.javadoc.Token.BlockQuoteCloseTag;
27+
import com.google.googlejavaformat.java.javadoc.Token.BlockQuoteOpenTag;
2828
import com.google.googlejavaformat.java.javadoc.Token.BrTag;
2929
import com.google.googlejavaformat.java.javadoc.Token.CodeCloseTag;
3030
import com.google.googlejavaformat.java.javadoc.Token.CodeOpenTag;
@@ -257,15 +257,15 @@ void writeParagraphOpen(Token token) {
257257
writeToken(token);
258258
}
259259

260-
void writeBlockquoteOpen(BlockquoteOpenTag token) {
260+
void writeBlockQuoteOpen(BlockQuoteOpenTag token) {
261261
requestBlankLine();
262262

263263
writeToken(token);
264264

265265
requestNewline();
266266
}
267267

268-
void writeBlockquoteClose(BlockquoteCloseTag token) {
268+
void writeBlockQuoteClose(BlockQuoteCloseTag token) {
269269
requestNewline();
270270

271271
writeToken(token);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ record ParagraphOpenTag(String value) implements Token, StartOfLineToken {}
7878

7979
record ParagraphCloseTag(String value) implements Token {}
8080

81-
record BlockquoteOpenTag(String value) implements Token {}
81+
record BlockQuoteOpenTag(String value) implements Token {}
8282

83-
record BlockquoteCloseTag(String value) implements Token {}
83+
record BlockQuoteCloseTag(String value) implements Token {}
8484

8585
record PreOpenTag(String value) implements Token {}
8686

0 commit comments

Comments
 (0)