aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.idea/kotlinc.xml7
-rw-r--r--.idea/runConfigurations/Stdlib.xml2
-rw-r--r--core/src/main/kotlin/Analysis/AnalysisEnvironment.kt4
-rw-r--r--core/src/main/kotlin/DokkaBootstrapImpl.kt9
-rw-r--r--core/src/main/kotlin/Formats/GFMFormatService.kt21
-rw-r--r--core/src/main/kotlin/Formats/HtmlFormatService.kt9
-rw-r--r--core/src/main/kotlin/Formats/JekyllFormatService.kt18
-rw-r--r--core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt63
-rw-r--r--core/src/main/kotlin/Formats/MarkdownFormatService.kt15
-rw-r--r--core/src/main/kotlin/Formats/StructuredFormatService.kt203
-rw-r--r--core/src/main/kotlin/Generation/DokkaGenerator.kt76
-rw-r--r--core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt4
-rw-r--r--core/src/main/kotlin/Java/JavadocParser.kt7
-rw-r--r--core/src/main/kotlin/Kotlin/ContentBuilder.kt2
-rw-r--r--core/src/main/kotlin/Kotlin/DeclarationLinkResolver.kt2
-rw-r--r--core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt2
-rw-r--r--core/src/main/kotlin/Kotlin/DocumentationBuilder.kt253
-rw-r--r--core/src/main/kotlin/Kotlin/KotlinLanguageService.kt72
-rw-r--r--core/src/main/kotlin/Markdown/MarkdownProcessor.kt5
-rw-r--r--core/src/main/kotlin/Model/DocumentationNode.kt12
-rw-r--r--core/src/main/kotlin/Model/DocumentationReference.kt23
-rw-r--r--core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt7
-rw-r--r--core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt18
-rw-r--r--core/src/main/kotlin/Utilities/DokkaModules.kt (renamed from core/src/main/kotlin/Utilities/DokkaModule.kt)60
-rw-r--r--core/src/main/resources/dokka/styles/style.css7
-rw-r--r--core/src/test/kotlin/TestAPI.kt56
-rw-r--r--core/src/test/kotlin/format/GFMFormatTest.kt2
-rw-r--r--core/src/test/kotlin/format/HtmlFormatTest.kt10
-rw-r--r--core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt36
-rw-r--r--core/src/test/kotlin/format/KotlinWebSiteRunnableSamplesFormatTest.kt10
-rw-r--r--core/src/test/kotlin/format/MarkdownFormatTest.kt127
-rw-r--r--core/src/test/kotlin/javadoc/JavadocTest.kt19
-rw-r--r--core/src/test/kotlin/model/ClassTest.kt12
-rw-r--r--core/src/test/kotlin/model/CommentTest.kt7
-rw-r--r--core/src/test/kotlin/model/FunctionTest.kt12
-rw-r--r--core/src/test/kotlin/model/PropertyTest.kt12
-rw-r--r--core/src/test/kotlin/model/TypeAliasTest.kt9
-rw-r--r--core/testdata/classes/sinceKotlin.kt5
-rw-r--r--core/testdata/format/blankLineInsideCodeBlock.html18
-rw-r--r--core/testdata/format/blankLineInsideCodeBlock.kt12
-rw-r--r--core/testdata/format/blankLineInsideCodeBlock.md14
-rw-r--r--core/testdata/format/codeBlock.html6
-rw-r--r--core/testdata/format/dynamicExtension.kt3
-rw-r--r--core/testdata/format/dynamicExtension.md10
-rw-r--r--core/testdata/format/dynamicType.kt2
-rw-r--r--core/testdata/format/dynamicType.md5
-rw-r--r--core/testdata/format/memberExtension.kt8
-rw-r--r--core/testdata/format/memberExtension.md10
-rw-r--r--core/testdata/format/multiplatform/breadcrumbsInMemberOfMemberOfGroupNode/js.kt7
-rw-r--r--core/testdata/format/multiplatform/breadcrumbsInMemberOfMemberOfGroupNode/jvm.kt9
-rw-r--r--core/testdata/format/multiplatform/breadcrumbsInMemberOfMemberOfGroupNode/multiplatform.md8
-rw-r--r--core/testdata/format/multiplatform/groupNode/js.kt8
-rw-r--r--core/testdata/format/multiplatform/groupNode/jvm.kt9
-rw-r--r--core/testdata/format/multiplatform/groupNode/multiplatform.md20
-rw-r--r--core/testdata/format/multiplatform/groupNode/multiplatform.package.md13
-rw-r--r--core/testdata/format/multiplatform/implied/foo.md24
-rw-r--r--core/testdata/format/multiplatform/implied/js.kt16
-rw-r--r--core/testdata/format/multiplatform/implied/jvm.kt16
-rw-r--r--core/testdata/format/multiplatform/merge/js.kt7
-rw-r--r--core/testdata/format/multiplatform/merge/jvm.kt8
-rw-r--r--core/testdata/format/multiplatform/merge/multiplatform.package.md10
-rw-r--r--core/testdata/format/multiplatform/mergeMembers/foo.md26
-rw-r--r--core/testdata/format/multiplatform/mergeMembers/js.kt16
-rw-r--r--core/testdata/format/multiplatform/mergeMembers/jvm.kt16
-rw-r--r--core/testdata/format/multiplatform/omitRedundant/foo.md22
-rw-r--r--core/testdata/format/multiplatform/omitRedundant/js.kt2
-rw-r--r--core/testdata/format/multiplatform/omitRedundant/jvm.kt11
-rw-r--r--core/testdata/format/multiplatform/packagePlatformsFromMembers/js.kt3
-rw-r--r--core/testdata/format/multiplatform/packagePlatformsFromMembers/jvm.kt3
-rw-r--r--core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.md10
-rw-r--r--core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.package.md10
-rw-r--r--core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/jvm.kt5
-rw-r--r--core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/multiplatform.index.md10
-rw-r--r--core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/multiplatform.package.md10
-rw-r--r--core/testdata/format/multiplatform/simple/js.kt7
-rw-r--r--core/testdata/format/multiplatform/simple/jvm.kt8
-rw-r--r--core/testdata/format/multiplatform/simple/multiplatform.package.md9
-rw-r--r--core/testdata/format/renderFunctionalTypeInParenthesisWhenItIsReceiver.kt3
-rw-r--r--core/testdata/format/renderFunctionalTypeInParenthesisWhenItIsReceiver.md6
-rw-r--r--core/testdata/format/sinceKotlin.html27
-rw-r--r--core/testdata/format/sinceKotlin.kt5
-rw-r--r--core/testdata/format/sinceKotlin.md14
-rw-r--r--core/testdata/format/sinceKotlin.package.md10
-rw-r--r--core/testdata/format/suspendParam.kt3
-rw-r--r--core/testdata/format/suspendParam.md5
-rw-r--r--core/testdata/format/suspendParam.package.md8
-rw-r--r--core/testdata/format/tripleBackticks.html3
-rw-r--r--core/testdata/format/website-samples/dropImport.md1
-rw-r--r--core/testdata/format/website-samples/newLinesInImportList.kt12
-rw-r--r--core/testdata/format/website-samples/newLinesInImportList.md24
-rw-r--r--core/testdata/format/website-samples/newLinesInSamples.kt19
-rw-r--r--core/testdata/format/website-samples/newLinesInSamples.md31
-rw-r--r--core/testdata/format/website-samples/sample.md1
-rw-r--r--core/testdata/format/website-samples/sampleWithAsserts.md1
-rw-r--r--core/testdata/format/website/dataTags/jre7.kt11
-rw-r--r--core/testdata/format/website/dataTags/js.kt11
-rw-r--r--core/testdata/format/website/dataTags/jvm.kt11
-rw-r--r--core/testdata/format/website/dataTags/multiplatform.package.md71
-rw-r--r--core/testdata/format/website/dataTagsInGroupNode/jre7.kt0
-rw-r--r--core/testdata/format/website/dataTagsInGroupNode/js.kt8
-rw-r--r--core/testdata/format/website/dataTagsInGroupNode/jvm.kt9
-rw-r--r--core/testdata/format/website/dataTagsInGroupNode/multiplatform.md56
-rw-r--r--core/testdata/format/website/dataTagsInGroupNode/multiplatform.package.md43
-rw-r--r--core/testdata/functions/sinceKotlin.kt5
-rw-r--r--core/testdata/javadoc/blankLineInsideCodeBlock.kt12
-rw-r--r--core/testdata/properties/sinceKotlin.kt5
-rw-r--r--core/testdata/typealias/sinceKotlin.kt5
-rw-r--r--gradle.properties4
-rw-r--r--integration/src/main/kotlin/org/jetbrains/dokka/DokkaBootstrap.kt1
-rw-r--r--lib/kotlin-compiler.jarbin22257475 -> 22544590 bytes
-rw-r--r--lib/kotlin-ide-common.jarbin445319 -> 449435 bytes
-rw-r--r--lib/kotlin-script-runtime.jarbin3353 -> 3299 bytes
-rw-r--r--lib/markdown.jarbin379275 -> 375565 bytes
-rw-r--r--runners/ant/src/main/kotlin/ant/dokka.kt24
-rw-r--r--runners/cli/src/main/kotlin/cli/main.kt8
-rw-r--r--runners/gradle-plugin/src/main/kotlin/main.kt1
-rw-r--r--runners/maven-plugin/src/main/kotlin/DokkaMojo.kt9
117 files changed, 1800 insertions, 296 deletions
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 00000000..1c24f9a8
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="KotlinCommonCompilerArguments">
+ <option name="languageVersion" value="1.1" />
+ <option name="apiVersion" value="1.1" />
+ </component>
+</project> \ No newline at end of file
diff --git a/.idea/runConfig