From badba07c1d151ff5a9cf623abecf7f2c906b5931 Mon Sep 17 00:00:00 2001 From: Ilya Ryzhenkov Date: Mon, 22 Dec 2014 18:31:01 +0300 Subject: Fix trailing EOL breaking markdown parser, remove multi-doc test as unsupported. --- lib/markdown.jar | Bin 387471 -> 387482 bytes src/Analysis/CommentsAPI.kt | 2 +- test/data/comments/multipleDocs.kt | 8 -------- test/src/model/CommentTest.kt | 9 --------- 4 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 test/data/comments/multipleDocs.kt diff --git a/lib/markdown.jar b/lib/markdown.jar index 4e15fbea..9ab8c95c 100644 Binary files a/lib/markdown.jar and b/lib/markdown.jar 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()) { -- cgit