|
28 | 28 | import com.google.googlejavaformat.java.javadoc.Token.MarkdownCodeSpanEnd; |
29 | 29 | import com.google.googlejavaformat.java.javadoc.Token.MarkdownCodeSpanStart; |
30 | 30 | import com.google.googlejavaformat.java.javadoc.Token.MarkdownFencedCodeBlock; |
| 31 | +import com.google.googlejavaformat.java.javadoc.Token.MarkdownTable; |
31 | 32 | import com.google.googlejavaformat.java.javadoc.Token.ParagraphCloseTag; |
32 | 33 | import com.google.googlejavaformat.java.javadoc.Token.ParagraphOpenTag; |
33 | 34 | import java.util.Objects; |
34 | 35 | import java.util.regex.Matcher; |
35 | 36 | import java.util.regex.Pattern; |
| 37 | +import org.commonmark.ext.gfm.tables.TableBlock; |
| 38 | +import org.commonmark.ext.gfm.tables.TablesExtension; |
36 | 39 | import org.commonmark.node.BulletList; |
37 | 40 | import org.commonmark.node.Code; |
38 | 41 | import org.commonmark.node.FencedCodeBlock; |
@@ -93,6 +96,10 @@ void visit(Node node) { |
93 | 96 | case OrderedList orderedList -> addSpan(orderedList, LIST_OPEN_TOKEN, LIST_CLOSE_TOKEN); |
94 | 97 | case ListItem listItem -> alreadyVisitedChildren = visitListItem(listItem); |
95 | 98 | case FencedCodeBlock fencedCodeBlock -> visitFencedCodeBlock(fencedCodeBlock); |
| 99 | + case TableBlock tableBlock -> { |
| 100 | + visitTableBlock(tableBlock); |
| 101 | + alreadyVisitedChildren = true; |
| 102 | + } |
96 | 103 | case Code code -> visitCodeSpan(code); |
97 | 104 | // TODO: others |
98 | 105 | default -> {} |
@@ -143,6 +150,12 @@ private void visitFencedCodeBlock(FencedCodeBlock fencedCodeBlock) { |
143 | 150 | positionToToken.get(start).addLast(token); |
144 | 151 | } |
145 | 152 |
|
| 153 | + private void visitTableBlock(TableBlock tableBlock) { |
| 154 | + int start = startPosition(tableBlock); |
| 155 | + int end = endPosition(tableBlock); |
| 156 | + positionToToken.get(start).addLast(new MarkdownTable(input.substring(start, end))); |
| 157 | + } |
| 158 | + |
146 | 159 | private void visitCodeSpan(Code code) { |
147 | 160 | int start = startPosition(code); |
148 | 161 | int end = endPosition(code); |
@@ -200,7 +213,10 @@ public String toString() { |
200 | 213 | } |
201 | 214 |
|
202 | 215 | private static final Parser PARSER = |
203 | | - Parser.builder().includeSourceSpans(IncludeSourceSpans.BLOCKS_AND_INLINES).build(); |
| 216 | + Parser.builder() |
| 217 | + .includeSourceSpans(IncludeSourceSpans.BLOCKS_AND_INLINES) |
| 218 | + .extensions(ImmutableList.of(TablesExtension.create())) |
| 219 | + .build(); |
204 | 220 |
|
205 | 221 | private static final HeaderOpenTag HEADER_OPEN_TOKEN = new HeaderOpenTag(""); |
206 | 222 | private static final HeaderCloseTag HEADER_CLOSE_TOKEN = new HeaderCloseTag(""); |
|
0 commit comments