From 87edf7c5778a9e1ac3e17c9046110d69e8d197a6 Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Mon, 27 Jul 2015 16:11:36 +0300 Subject: Eliminate warnings caused by API changes --- src/Model/Content.kt | 2 +- src/Model/DocumentationNode.kt | 1 + src/Model/PackageDocs.kt | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/Model') diff --git a/src/Model/Content.kt b/src/Model/Content.kt index 810d6417..032de268 100644 --- a/src/Model/Content.kt +++ b/src/Model/Content.kt @@ -142,7 +142,7 @@ public open class MutableContent() : Content() { public override val summary: ContentNode get() = children.firstOrNull() ?: ContentEmpty - public override val description: ContentNode by Delegates.lazy { + public override val description: ContentNode by lazy { val descriptionNodes = children.drop(1) if (descriptionNodes.isEmpty()) { ContentEmpty diff --git a/src/Model/DocumentationNode.kt b/src/Model/DocumentationNode.kt index 2f0638bc..b4343347 100644 --- a/src/Model/DocumentationNode.kt +++ b/src/Model/DocumentationNode.kt @@ -134,6 +134,7 @@ fun DocumentationNode.findOrCreatePackageNode(packageName: String, packageConten fun DocumentationNode.append(child: DocumentationNode, kind: DocumentationReference.Kind) { addReferenceTo(child, kind) + @suppress("NON_EXHAUSTIVE_WHEN") when (kind) { DocumentationReference.Kind.Detail -> child.addReferenceTo(this, DocumentationReference.Kind.Owner) DocumentationReference.Kind.Member -> child.addReferenceTo(this, DocumentationReference.Kind.Owner) diff --git a/src/Model/PackageDocs.kt b/src/Model/PackageDocs.kt index 3b0be547..b5b34942 100644 --- a/src/Model/PackageDocs.kt +++ b/src/Model/PackageDocs.kt @@ -13,8 +13,8 @@ public class PackageDocs(val documentationBuilder: DocumentationBuilder, public val packageContent: Map get() = _packageContent - fun parse(file: String) { - val file = File(file) + fun parse(path: String) { + val file = File(path) if (file.exists()) { val text = file.readText() val tree = parseMarkdown(text) -- cgit From e1f7ce7a16954d238345fe0e30257492c0886f37 Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Tue, 4 Aug 2015 18:47:25 +0300 Subject: ~ see also --- src/Model/Content.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/Model') diff --git a/src/Model/Content.kt b/src/Model/Content.kt index 032de268..cd387b61 100644 --- a/src/Model/Content.kt +++ b/src/Model/Content.kt @@ -1,7 +1,5 @@ package org.jetbrains.dokka -import kotlin.properties.Delegates - public abstract class ContentNode public object ContentEmpty : ContentNode() @@ -87,6 +85,11 @@ public class ContentSection(public val tag: String, public val subjectName: Stri children.hashCode() * 31 * 31 + tag.hashCode() * 31 + (subjectName?.hashCode() ?: 0) } +public object ContentTags { + val Description = "Description" + val SeeAlso = "See Also" +} + fun content(body: ContentBlock.() -> Unit): ContentBlock { val block = ContentBlock() block.body() -- cgit From 4ed808d935125ab370d988f9cb32d96839959964 Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Thu, 6 Aug 2015 11:36:38 +0300 Subject: ~ description constant --- src/Model/Content.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Model') diff --git a/src/Model/Content.kt b/src/Model/Content.kt index cd387b61..0bb78454 100644 --- a/src/Model/Content.kt +++ b/src/Model/Content.kt @@ -150,7 +150,7 @@ public open class MutableContent() : Content() { if (descriptionNodes.isEmpty()) { ContentEmpty } else { - val result = ContentSection("Description", null) + val result = ContentSection(ContentTags.Description, null) result.children.addAll(descriptionNodes) result } -- cgit From d1ff5949b5807b57eab6010175b3c6f1e7c1945c Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Fri, 7 Aug 2015 12:12:06 +0300 Subject: ~ minor cleanup --- src/Model/DocumentationNode.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/Model') diff --git a/src/Model/DocumentationNode.kt b/src/Model/DocumentationNode.kt index b4343347..c3b9942d 100644 --- a/src/Model/DocumentationNode.kt +++ b/src/Model/DocumentationNode.kt @@ -114,9 +114,7 @@ public open class DocumentationNode(val name: String, val DocumentationNode.path: List get() { - val parent = owner - if (parent == null) - return listOf(this) + val parent = owner ?: return listOf(this) return parent.path + this } -- cgit