diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-12 17:30:20 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-12 17:30:20 +0100 |
| commit | 370b3913e2c629073af91bf9f63be917de2cc6d1 (patch) | |
| tree | 738b61ef94ccdecc19f9baea2a0b37b273aa3f01 /src/Kotlin | |
| parent | 0c584d0e12f07946fdfc8cc0e9f132558ff794fc (diff) | |
| parent | 75e1f85d92d1a0485983103dd61c46447068c20f (diff) | |
| download | dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.tar.gz dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.tar.bz2 dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.zip | |
Merge branch 'master' into enum-members
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) |