diff options
author | Fabrice Bellingard <bellingard@gmail.com> | 2012-02-16 19:01:04 +0100 |
---|---|---|
committer | Fabrice Bellingard <bellingard@gmail.com> | 2012-02-16 19:01:04 +0100 |
commit | cd4a931a8de29b68aa3bdfedd2f030c00a369ae0 (patch) | |
tree | 892515ed3241efeb95b1e486d4cf0da987b3375b /sonar-markdown/src | |
parent | 89c2abe481c82ce878e4142d9e115c4178b36e5b (diff) | |
download | sonarqube-cd4a931a8de29b68aa3bdfedd2f030c00a369ae0.tar.gz sonarqube-cd4a931a8de29b68aa3bdfedd2f030c00a369ae0.zip |
SONAR-3269 Add multiline code support on Sonar markdown
Diffstat (limited to 'sonar-markdown/src')
3 files changed, 54 insertions, 0 deletions
diff --git a/sonar-markdown/src/main/java/org/sonar/markdown/HtmlMultilineCodeChannel.java b/sonar-markdown/src/main/java/org/sonar/markdown/HtmlMultilineCodeChannel.java new file mode 100644 index 00000000000..1b032126031 --- /dev/null +++ b/sonar-markdown/src/main/java/org/sonar/markdown/HtmlMultilineCodeChannel.java @@ -0,0 +1,47 @@ +/* + * Sonar, open source software quality management tool. + * Copyright (C) 2008-2012 SonarSource + * mailto:contact AT sonarsource DOT com + * + * Sonar is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * Sonar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Sonar; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 + */ +package org.sonar.markdown; + +import org.sonar.channel.RegexChannel; + +/** + * Markdown treats double backtick quote (``) as indicators of code. Text wrapped with two `` and that spans on multiple lines will be wrapped with + * an HTML {@literal <pre><code>} tag. + * + * E.g., the input: + * ``This code + * spans on 2 lines`` + * will produce: + * {@literal<pre>}{@literal<code>}This code + * spans on 2 lines{@literal</code>}{@literal</pre>} + */ +class HtmlMultilineCodeChannel extends RegexChannel<MarkdownOutput> { + + public HtmlMultilineCodeChannel() { + super("``[\\s\\S]+?``"); + } + + @Override + protected void consume(CharSequence token, MarkdownOutput output) { + output.append("<pre><code>"); + output.append(token.subSequence(2, token.length() - 2)); + output.append("</code></pre>"); + } +} diff --git a/sonar-markdown/src/main/java/org/sonar/markdown/Markdown.java b/sonar-markdown/src/main/java/org/sonar/markdown/Markdown.java index e04060508d3..4e16fffb261 100644 --- a/sonar-markdown/src/main/java/org/sonar/markdown/Markdown.java +++ b/sonar-markdown/src/main/java/org/sonar/markdown/Markdown.java @@ -36,6 +36,7 @@ public final class Markdown { .addChannel(new HtmlEmphasisChannel()) .addChannel(new HtmlListChannel()) .addChannel(new HtmlCodeChannel()) + .addChannel(new HtmlMultilineCodeChannel()) .addChannel(new IdentifierAndNumberChannel()) .addChannel(new BlackholeChannel()) .build(); diff --git a/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java b/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java index 7ececab3ebc..982afa58f26 100644 --- a/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java +++ b/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java @@ -51,6 +51,12 @@ public class MarkdownTest { } @Test + public void shouldDecorateMultipleLineCode() { + assertThat(Markdown.convertToHtml("This is a ``line of code\nOn multiple lines``"), is("This is a <pre><code>line of code\nOn multiple lines</code></pre>")); + assertThat(Markdown.convertToHtml("This is not a ``line of code\nOn multiple lines"), is("This is not a ``line of code<br/>On multiple lines")); + } + + @Test public void shouldEmphaseText() { assertThat(Markdown.convertToHtml("This is *important*"), is("This is <em>important</em>")); assertThat(Markdown.convertToHtml("This should not be * \n emphase"), is("This should not be * <br/> emphase")); |