diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-12 17:27:41 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-12 17:27:41 +0100 |
| commit | 7158019f4a15c8d78faa888666accf8448aff0d4 (patch) | |
| tree | c212aad1d709b8f62a5aac5f9782eeeaa50d68e0 /src/Kotlin | |
| parent | 49feb9021ca24150257caac4a62af5628f52b6b5 (diff) | |
| parent | 5dbadfe3764b4e4564354f4a5a29d7a521c9b632 (diff) | |
| download | dokka-7158019f4a15c8d78faa888666accf8448aff0d4.tar.gz dokka-7158019f4a15c8d78faa888666accf8448aff0d4.tar.bz2 dokka-7158019f4a15c8d78faa888666accf8448aff0d4.zip | |
Merge branch 'jet' of https://github.com/udalov/dokka into udalov-jet
Conflicts:
src/Kotlin/DocumentationBuilder.kt
test/src/TestAPI.kt
Diffstat (limited to 'src/Kotlin')
| -rw-r--r-- | src/Kotlin/ContentBuilder.kt | 8 | ||||
| -rw-r--r-- | src/Kotlin/DocumentationBuilder.kt | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/Kotlin/ContentBuilder.kt b/src/Kotlin/ContentBuilder.kt index 0143feed..0143a46e 100644 --- a/src/Kotlin/ContentBuilder.kt +++ b/src/Kotlin/ContentBuilder.kt @@ -1,10 +1,10 @@ package org.jetbrains.dokka import java.util.ArrayDeque -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.* -import org.jetbrains.jet.lang.resolve.scopes.* -import org.jetbrains.jet.lang.resolve.name.* +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.resolve.* +import org.jetbrains.kotlin.resolve.scopes.* +import org.jetbrains.kotlin.name.* import org.intellij.markdown.* public fun DocumentationBuilder.buildContent(tree: MarkdownNode, descriptor: DeclarationDescriptor): Content { diff --git a/src/Kotlin/DocumentationBuilder.kt b/src/Kotlin/DocumentationBuilder.kt index baa17b5c..8b6b19d3 100644 --- a/src/Kotlin/DocumentationBuilder.kt +++ b/src/Kotlin/DocumentationBuilder.kt @@ -1,17 +1,17 @@ package org.jetbrains.dokka -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.dokka.DocumentationNode.* -import org.jetbrains.jet.lang.types.* -import org.jetbrains.jet.lang.types.lang.* -import org.jetbrains.jet.lang.resolve.name.* -import org.jetbrains.jet.lang.resolve.lazy.* -import org.jetbrains.jet.lang.descriptors.annotations.Annotated -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor -import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant +import org.jetbrains.kotlin.types.* +import org.jetbrains.kotlin.builtins.* +import org.jetbrains.kotlin.name.* +import org.jetbrains.kotlin.resolve.lazy.* +import org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.descriptors.annotations.Annotated +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant import com.intellij.openapi.util.text.StringUtil -import org.jetbrains.jet.lang.descriptors.impl.EnumEntrySyntheticClassDescriptor +import org.jetbrains.kotlin.descriptors.impl.EnumEntrySyntheticClassDescriptor public data class DocumentationOptions(val includeNonPublic: Boolean = false) |