Skip to content
Snippets Groups Projects
Commit 37e507ab authored by Robin Stocker's avatar Robin Stocker
Browse files

Reorder methods in spec order

parent 59d5c030
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
commonmark/src/main/java/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java
+ 119
− 119
View file @ 37e507ab
...@@ -86,6 +86,114 @@ public class CoreMarkdownNodeRenderer extends AbstractVisitor implements NodeRen ...@@ -86,6 +86,114 @@ public class CoreMarkdownNodeRenderer extends AbstractVisitor implements NodeRen
writer.line(); writer.line();
} }
@Override
public void visit(ThematicBreak thematicBreak) {
writer.write("***");
writer.block();
}
@Override
public void visit(Heading heading) {
if (heading.getLevel() <= 2) {
LineBreakVisitor lineBreakVisitor = new LineBreakVisitor();
heading.accept(lineBreakVisitor);
boolean isMultipleLines = lineBreakVisitor.hasLineBreak();
if (isMultipleLines) {
// Setext headings: Can have multiple lines, but only level 1 or 2
visitChildren(heading);
writer.line();
if (heading.getLevel() == 1) {
// Note that it would be nice to match the length of the contents instead of just using 3, but that's
// not easy.
writer.write("===");
} else {
writer.write("---");
}
writer.block();
return;
}
}
// ATX headings: Can't have multiple lines, but up to level 6.
for (int i = 0; i < heading.getLevel(); i++) {
writer.write('#');
}
writer.write(' ');
visitChildren(heading);
writer.block();
}
@Override
public void visit(IndentedCodeBlock indentedCodeBlock) {
String literal = indentedCodeBlock.getLiteral();
// We need to respect line prefixes which is why we need to write it line by line (e.g. an indented code block
// within a block quote)
writer.writePrefix(" ");
writer.pushPrefix(" ");
List<String> lines = getLines(literal);
for (int i = 0; i < lines.size(); i++) {
String line = lines.get(i);
writer.write(line);
if (i != lines.size() - 1) {
writer.line();
}
}
writer.popPrefix();
writer.block();
}
@Override
public void visit(FencedCodeBlock fencedCodeBlock) {
String literal = fencedCodeBlock.getLiteral();
String fence = repeat(String.valueOf(fencedCodeBlock.getFenceChar()), fencedCodeBlock.getFenceLength());
int indent = fencedCodeBlock.getFenceIndent();
if (indent > 0) {
String indentPrefix = repeat(" ", indent);
writer.writePrefix(indentPrefix);
writer.pushPrefix(indentPrefix);
}
writer.write(fence);
if (fencedCodeBlock.getInfo() != null) {
writer.write(fencedCodeBlock.getInfo());
}
writer.line();
if (!literal.isEmpty()) {
List<String> lines = getLines(literal);
for (String line : lines) {
writer.write(line);
writer.line();
}
}
writer.write(fence);
if (indent > 0) {
writer.popPrefix();
}
writer.block();
}
@Override
public void visit(HtmlBlock htmlBlock) {
List<String> lines = getLines(htmlBlock.getLiteral());
for (int i = 0; i < lines.size(); i++) {
String line = lines.get(i);
writer.write(line);
if (i != lines.size() - 1) {
writer.line();
}
}
writer.block();
}
@Override
public void visit(Paragraph paragraph) {
visitChildren(paragraph);
writer.block();
}
@Override @Override
public void visit(BlockQuote blockQuote) { public void visit(BlockQuote blockQuote) {
writer.writePrefix("> "); writer.writePrefix("> ");
...@@ -183,79 +291,20 @@ public class CoreMarkdownNodeRenderer extends AbstractVisitor implements NodeRen ...@@ -183,79 +291,20 @@ public class CoreMarkdownNodeRenderer extends AbstractVisitor implements NodeRen
} }
@Override @Override
public void visit(FencedCodeBlock fencedCodeBlock) { public void visit(StrongEmphasis strongEmphasis) {
String literal = fencedCodeBlock.getLiteral(); writer.write("**");
String fence = repeat(String.valueOf(fencedCodeBlock.getFenceChar()), fencedCodeBlock.getFenceLength()); super.visit(strongEmphasis);
int indent = fencedCodeBlock.getFenceIndent(); writer.write("**");
if (indent > 0) {
String indentPrefix = repeat(" ", indent);
writer.writePrefix(indentPrefix);
writer.pushPrefix(indentPrefix);
}
writer.write(fence);
if (fencedCodeBlock.getInfo() != null) {
writer.write(fencedCodeBlock.getInfo());
}
writer.line();
if (!literal.isEmpty()) {
List<String> lines = getLines(literal);
for (String line : lines) {
writer.write(line);
writer.line();
}
}
writer.write(fence);
if (indent > 0) {
writer.popPrefix();
}
writer.block();
}
@Override
public void visit(HardLineBreak hardLineBreak) {
writer.write(" ");
writer.line();
} }
@Override @Override
public void visit(Heading heading) { public void visit(Link link) {
if (heading.getLevel() <= 2) { writeLinkLike(link.getTitle(), link.getDestination(), link, "[");
LineBreakVisitor lineBreakVisitor = new LineBreakVisitor();
heading.accept(lineBreakVisitor);
boolean isMultipleLines = lineBreakVisitor.hasLineBreak();
if (isMultipleLines) {
// Setext headings: Can have multiple lines, but only level 1 or 2
visitChildren(heading);
writer.line();
if (heading.getLevel() == 1) {
// Note that it would be nice to match the length of the contents instead of just using 3, but that's
// not easy.
writer.write("===");
} else {
writer.write("---");
}
writer.block();
return;
}
}
// ATX headings: Can't have multiple lines, but up to level 6.
for (int i = 0; i < heading.getLevel(); i++) {
writer.write('#');
}
writer.write(' ');
visitChildren(heading);
writer.block();
} }
@Override @Override
public void visit(ThematicBreak thematicBreak) { public void visit(Image image) {
writer.write("***"); writeLinkLike(image.getTitle(), image.getDestination(), image, "![");
writer.block();
} }
@Override @Override
...@@ -264,65 +313,16 @@ public class CoreMarkdownNodeRenderer extends AbstractVisitor implements NodeRen ...@@ -264,65 +313,16 @@ public class CoreMarkdownNodeRenderer extends AbstractVisitor implements NodeRen
} }
@Override @Override
public void visit(HtmlBlock htmlBlock) { public void visit(HardLineBreak hardLineBreak) {
List<String> lines = getLines(htmlBlock.getLiteral()); writer.write(" ");
for (int i = 0; i < lines.size(); i++) {
String line = lines.get(i);
writer.write(line);
if (i != lines.size() - 1) {
writer.line();
}
}
writer.block();
}
@Override
public void visit(Image image) {
writeLinkLike(image.getTitle(), image.getDestination(), image, "![");
}
@Override
public void visit(IndentedCodeBlock indentedCodeBlock) {
String literal = indentedCodeBlock.getLiteral();
// We need to respect line prefixes which is why we need to write it line by line (e.g. an indented code block
// within a block quote)
writer.writePrefix(" ");
writer.pushPrefix(" ");
List<String> lines = getLines(literal);
for (int i = 0; i < lines.size(); i++) {
String line = lines.get(i);
writer.write(line);
if (i != lines.size() - 1) {
writer.line(); writer.line();
} }
}
writer.popPrefix();
writer.block();
}
@Override
public void visit(Link link) {
writeLinkLike(link.getTitle(), link.getDestination(), link, "[");
}
@Override
public void visit(Paragraph paragraph) {
visitChildren(paragraph);
writer.block();
}
@Override @Override
public void visit(SoftLineBreak softLineBreak) { public void visit(SoftLineBreak softLineBreak) {
writer.line(); writer.line();
} }
@Override
public void visit(StrongEmphasis strongEmphasis) {
writer.write("**");
super.visit(strongEmphasis);
writer.write("**");
}
@Override @Override
public void visit(Text text) { public void visit(Text text) {
String literal = text.getLiteral(); String literal = text.getLiteral();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment