Skip to content

Commit 06aa3e5

Browse files
authored
Merge pull request #309 from commonmark/issue-295
Save original literal in ThematicBreak on parsing
2 parents 6385869 + bd40c08 commit 06aa3e5

File tree

3 files changed

+48
-1
lines changed

3 files changed

+48
-1
lines changed

commonmark/src/main/java/org/commonmark/internal/ThematicBreakParser.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ public class ThematicBreakParser extends AbstractBlockParser {
88

99
private final ThematicBreak block = new ThematicBreak();
1010

11+
public ThematicBreakParser(String literal) {
12+
block.setLiteral(literal);
13+
}
14+
1115
@Override
1216
public Block getBlock() {
1317
return block;
@@ -29,7 +33,8 @@ public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockPar
2933
int nextNonSpace = state.getNextNonSpaceIndex();
3034
CharSequence line = state.getLine().getContent();
3135
if (isThematicBreak(line, nextNonSpace)) {
32-
return BlockStart.of(new ThematicBreakParser()).atIndex(line.length());
36+
var literal = String.valueOf(line.subSequence(state.getIndex(), line.length()));
37+
return BlockStart.of(new ThematicBreakParser(literal)).atIndex(line.length());
3338
} else {
3439
return BlockStart.none();
3540
}

commonmark/src/main/java/org/commonmark/node/ThematicBreak.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,21 @@
22

33
public class ThematicBreak extends Block {
44

5+
private String literal;
6+
57
@Override
68
public void accept(Visitor visitor) {
79
visitor.visit(this);
810
}
11+
12+
/**
13+
* @return the source literal that represents this node, if available
14+
*/
15+
public String getLiteral() {
16+
return literal;
17+
}
18+
19+
public void setLiteral(String literal) {
20+
this.literal = literal;
21+
}
922
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package org.commonmark.test;
2+
3+
import org.commonmark.node.ThematicBreak;
4+
import org.commonmark.parser.Parser;
5+
import org.commonmark.renderer.html.HtmlRenderer;
6+
import org.commonmark.testutil.RenderingTestCase;
7+
import org.junit.Test;
8+
9+
import static org.junit.Assert.assertEquals;
10+
import static org.junit.Assert.assertNotNull;
11+
12+
public class ThematicBreakParserTest {
13+
14+
private static final Parser PARSER = Parser.builder().build();
15+
16+
@Test
17+
public void testLiteral() {
18+
assertLiteral("***", "***");
19+
assertLiteral("-- -", "-- -");
20+
assertLiteral(" __ __ __ ", " __ __ __ ");
21+
assertLiteral("***", "> ***");
22+
}
23+
24+
private static void assertLiteral(String expected, String input) {
25+
var tb = Nodes.find(PARSER.parse(input), ThematicBreak.class);
26+
assertNotNull(tb);
27+
assertEquals(expected, tb.getLiteral());
28+
}
29+
}

0 commit comments

Comments
 (0)