<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-channel</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
private class QuotedLineElementChannel extends RegexChannel<MarkdownOutput> {
protected QuotedLineElementChannel() {
- super(">\\s[^\r\n]*+");
+ super(">\\s[^\r\n]*+");
}
@Override
private int searchIndexOfFirstCharacter(CharSequence token) {
for (int index = 0; index < token.length(); index++) {
- if (token.charAt(index) == '>') {
+ if (token.charAt(index) == '&') {
+ index += 4;
while (++ index < token.length()) {
if (token.charAt(index) != ' ') {
return index;
*/
package org.sonar.markdown;
+import org.apache.commons.lang.StringEscapeUtils;
import org.sonar.channel.ChannelDispatcher;
import org.sonar.channel.CodeReader;
}
public static String convertToHtml(String input) {
- return new Markdown().convert(input);
+ return new Markdown().convert(StringEscapeUtils.escapeHtml(input));
}
}
@Test
public void shouldDecorateBlockquote() {
- assertThat(Markdown.convertToHtml("> Yesterday it worked\n> Today it is not working\r\n> Software is like that\r"))
- .isEqualTo("<blockquote>Yesterday it worked<br/>\nToday it is not working<br/>\r\nSoftware is like that<br/>\r</blockquote>");
+ assertThat(Markdown.convertToHtml("> Yesterday <br/> it worked\n> Today it is not working\r\n> Software is like that\r"))
+ .isEqualTo("<blockquote>Yesterday <br/> it worked<br/>\nToday it is not working<br/>\r\nSoftware is like that<br/>\r</blockquote>");
+ assertThat(Markdown.convertToHtml("HTML elements should <em>not</em> be quoted!"))
+ .isEqualTo("HTML elements should <em>not</em> be quoted!");
}
@Test
*/
package org.sonar.server.text;
-import org.apache.commons.lang.StringEscapeUtils;
import org.sonar.api.ServerComponent;
import org.sonar.markdown.Markdown;
import org.sonar.server.source.HtmlSourceDecorator;
// TODO add ruby example
public String markdownToHtml(String markdown) {
- // TODO move HTML escaping to sonar-markdown
- return Markdown.convertToHtml(StringEscapeUtils.escapeHtml(markdown));
+ return Markdown.convertToHtml(markdown);
}
// TODO add ruby example