aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Ryzhenkov <orangy@jetbrains.com>2014-12-22 18:31:01 +0300
committerIlya Ryzhenkov <orangy@jetbrains.com>2014-12-22 18:31:01 +0300
commitbadba07c1d151ff5a9cf623abecf7f2c906b5931 (patch)
treeb0b1134e30bcb1e118aa99fd50e47ca1f11c7f28
parent40f64f348fc21008cc3acf3c13a149ec6d10bb70 (diff)
downloaddokka-badba07c1d151ff5a9cf623abecf7f2c906b5931.tar.gz
dokka-badba07c1d151ff5a9cf623abecf7f2c906b5931.tar.bz2
dokka-badba07c1d151ff5a9cf623abecf7f2c906b5931.zip
Fix trailing EOL breaking markdown parser, remove multi-doc test as unsupported.
-rw-r--r--lib/markdown.jarbin387471 -> 387482 bytes
-rw-r--r--src/Analysis/CommentsAPI.kt2
-rw-r--r--test/data/comments/multipleDocs.kt8
-rw-r--r--test/src/model/CommentTest.kt9
4 files changed, 1 insertions, 18 deletions
diff --git a/lib/markdown.jar b/lib/markdown.jar
index 4e15fbea..9ab8c95c 100644
--- a/lib/markdown.jar
+++ b/lib/markdown.jar
Binary files differ
diff --git a/src/Analysis/CommentsAPI.kt b/src/Analysis/CommentsAPI.kt
index 5f3f6283..b195107a 100644
--- a/src/Analysis/CommentsAPI.kt
+++ b/src/Analysis/CommentsAPI.kt
@@ -38,5 +38,5 @@ fun KDoc?.extractText(): String {
comment.substring(0, comment.length() - 2)
else
comment).trim()
- }.join("\n")
+ }.join("\n").trim("\n")
} \ No newline at end of file
diff --git a/test/data/comments/multipleDocs.kt b/test/data/comments/multipleDocs.kt
deleted file mode 100644
index 654ea935..00000000
--- a/test/data/comments/multipleDocs.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * doc1
- */
-/**
- * doc2
- */
-/** doc3 */
-val property = "test" \ No newline at end of file
diff --git a/test/src/model/CommentTest.kt b/test/src/model/CommentTest.kt
index 51bcc735..2d87b928 100644
--- a/test/src/model/CommentTest.kt
+++ b/test/src/model/CommentTest.kt
@@ -30,15 +30,6 @@ public class CommentTest {
}
}
- Test fun multipleDocs() {
- verifyModel("test/data/comments/multipleDocs.kt") { model ->
- with(model.members.single().members.single()) {
- assertEquals("doc1", content.summary.toTestString())
- assertEquals("doc2\ndoc3", content.description.toTestString())
- }
- }
- }
-
Test fun multilineDocWithComment() {
verifyModel("test/data/comments/multilineDocWithComment.kt") { model ->
with(model.members.single().members.single()) {