diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-02-06 17:39:41 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-02-06 17:39:41 +0100 |
| commit | 3fe73a9430c1b782c5891fb61dd5565ab7ee9178 (patch) | |
| tree | c9a41e2cbcd2579e6d65d30a8f47ad2085d70853 | |
| parent | b78e3bb6c7d689bc1650088096461e687ee6441f (diff) | |
| download | dokka-3fe73a9430c1b782c5891fb61dd5565ab7ee9178.tar.gz dokka-3fe73a9430c1b782c5891fb61dd5565ab7ee9178.tar.bz2 dokka-3fe73a9430c1b782c5891fb61dd5565ab7ee9178.zip | |
handle parenthesis tokens in markdown
| -rw-r--r-- | src/Kotlin/ContentBuilder.kt | 4 | ||||
| -rw-r--r-- | test/data/format/parenthesis.html | 13 | ||||
| -rw-r--r-- | test/data/format/parenthesis.kt | 4 | ||||
| -rw-r--r-- | test/src/format/HtmlFormatTest.kt | 6 |
4 files changed, 26 insertions, 1 deletions
diff --git a/src/Kotlin/ContentBuilder.kt b/src/Kotlin/ContentBuilder.kt index 80d49a85..42a2d994 100644 --- a/src/Kotlin/ContentBuilder.kt +++ b/src/Kotlin/ContentBuilder.kt @@ -105,7 +105,9 @@ public fun DocumentationBuilder.buildContentTo(tree: MarkdownNode, target: Conte } MarkdownTokenTypes.DOUBLE_QUOTE, MarkdownTokenTypes.LT, - MarkdownTokenTypes.GT -> { + MarkdownTokenTypes.GT, + MarkdownTokenTypes.LPAREN, + MarkdownTokenTypes.RPAREN -> { parent.append(ContentText(node.text)) } else -> { diff --git a/test/data/format/parenthesis.html b/test/data/format/parenthesis.html new file mode 100644 index 00000000..9e739443 --- /dev/null +++ b/test/data/format/parenthesis.html @@ -0,0 +1,13 @@ +<HTML> +<HEAD> +<title>test / foo</title> +</HEAD> +<BODY> +<a href="out.html">test</a> / <a href="out.html"></a> / <a href="out.html">foo</a><br/> +<br/> +<h1>foo</h1> +<pre><code><span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></pre><p>foo (bar)</p> +<br/> +<br/> +</BODY> +</HTML> diff --git a/test/data/format/parenthesis.kt b/test/data/format/parenthesis.kt new file mode 100644 index 00000000..b906f64a --- /dev/null +++ b/test/data/format/parenthesis.kt @@ -0,0 +1,4 @@ +/** + * foo (bar) + */ +fun foo() {} diff --git a/test/src/format/HtmlFormatTest.kt b/test/src/format/HtmlFormatTest.kt index 0170d148..251c7074 100644 --- a/test/src/format/HtmlFormatTest.kt +++ b/test/src/format/HtmlFormatTest.kt @@ -45,4 +45,10 @@ public class HtmlFormatTest { htmlService.appendNodes(tempLocation, output, model.members.single().members) } } + + Test fun parenthesis() { + verifyOutput("test/data/format/parenthesis.kt", ".html") { model, output -> + htmlService.appendNodes(tempLocation, output, model.members.single().members) + } + } } |