aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2018-02-22 15:47:06 +0300
committerSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2018-02-22 15:47:06 +0300
commit3278122d5fd72efc03bd8339865c7d3c19582e8d (patch)
tree241cc9898798cce43257041691dfe26c6c4565ba
parent0a09b1bffb45eceb3f53296207b8b03715cc345b (diff)
parentec3d364e49268f1dfbc7619245ec36a49e780169 (diff)
downloaddokka-3278122d5fd72efc03bd8339865c7d3c19582e8d.tar.gz
dokka-3278122d5fd72efc03bd8339865c7d3c19582e8d.tar.bz2
dokka-3278122d5fd72efc03bd8339865c7d3c19582e8d.zip
Merge branch 'refactoring-layout-service' into dev
-rw-r--r--build.gradle1
-rw-r--r--core/build.gradle2
-rw-r--r--core/src/main/kotlin/Formats/AnalysisComponents.kt45
-rw-r--r--core/src/main/kotlin/Formats/FormatDescriptor.kt44
-rw-r--r--core/src/main/kotlin/Formats/GFMFormatService.kt46
-rw-r--r--core/src/main/kotlin/Formats/HtmlFormatService.kt22
-rw-r--r--core/src/main/kotlin/Formats/HtmlTemplateService.kt8
-rw-r--r--core/src/main/kotlin/Formats/JavaLayoutHtmlFormat.kt92
-rw-r--r--core/src/main/kotlin/Formats/JekyllFormatService.kt26
-rw-r--r--core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt67
-rw-r--r--core/src/main/kotlin/Formats/KotlinWebsiteHtmlFormatService.kt34
-rw-r--r--core/src/main/kotlin/Formats/MarkdownFormatService.kt14
-rw-r--r--core/src/main/kotlin/Formats/PackageListService.kt10
-rw-r--r--core/src/main/kotlin/Formats/StandardFormats.kt44
-rw-r--r--core/src/main/kotlin/Formats/StructuredFormatService.kt19
-rw-r--r--core/src/main/kotlin/Formats/YamlOutlineService.kt8
-rw-r--r--core/src/main/kotlin/Generation/ConsoleGenerator.kt42
-rw-r--r--core/src/main/kotlin/Generation/FileGenerator.kt31
-rw-r--r--core/src/main/kotlin/Generation/Generator.kt8
-rw-r--r--core/src/main/kotlin/Locations/FoldersLocationService.kt30
-rw-r--r--core/src/main/kotlin/Locations/Location.kt61
-rw-r--r--core/src/main/kotlin/Locations/LocationService.kt78
-rw-r--r--core/src/main/kotlin/Locations/SingleFolderLocationService.kt20
-rw-r--r--core/src/main/kotlin/Utilities/DokkaModules.kt57
-rw-r--r--core/src/main/kotlin/javadoc/dokka-adapters.kt26
-rw-r--r--core/src/main/resources/dokka/format/java-layout-html.properties2
-rw-r--r--core/src/main/resources/dokka/format/javadoc.properties3
-rw-r--r--core/src/main/resources/dokka/generator/default.properties2
-rw-r--r--core/src/main/resources/dokka/generator/javadoc.properties2
-rw-r--r--core/src/main/resources/dokka/language/java.properties1
-rw-r--r--core/src/main/resources/dokka/language/kotlin.properties1
-rw-r--r--core/src/main/resources/dokka/outline/yaml.properties1
-rw-r--r--core/src/test/kotlin/TestAPI.kt15
-rw-r--r--core/src/test/kotlin/format/FileGeneratorTestCase.kt35
-rw-r--r--core/src/test/kotlin/format/GFMFormatTest.kt15
-rw-r--r--core/src/test/kotlin/format/HtmlFormatTest.kt18
-rw-r--r--core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt17
-rw-r--r--core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt15
-rw-r--r--core/src/test/kotlin/format/KotlinWebSiteRunnableSamplesFormatTest.kt56
-rw-r--r--core/src/test/kotlin/format/MarkdownFormatTest.kt51
-rw-r--r--core/src/test/kotlin/format/PackageDocsTest.kt14
-rw-r--r--core/testdata/format/JavaSupertype.html10
-rw-r--r--core/testdata/format/accessor.md2
-rw-r--r--core/testdata/format/annotatedTypeParameter.md4
-rw-r--r--core/testdata/format/annotationClass.md4
-rw-r--r--core/testdata/format/annotationClass.package.md4
-rw-r--r--core/testdata/format/annotationParams.md2
-rw-r--r--core/testdata/format/annotations.md8
-rw-r--r--core/testdata/format/arrayAverage.md6
-rw-r--r--core/testdata/format/backtickInCodeBlock.md2
-rw-r--r--core/testdata/format/blankLineInsideCodeBlock.html2
-rw-r--r--core/testdata/format/blankLineInsideCodeBlock.md2
-rw-r--r--core/testdata/format/bracket.html2
-rw-r--r--core/testdata/format/brokenLink.html2
-rw-r--r--core/testdata/format/classWithCompanionObject.html8
-rw-r--r--core/testdata/format/classWithCompanionObject.md8
-rw-r--r--core/testdata/format/codeBlock.html44
-rw-r--r--core/testdata/format/codeBlock.md14
-rw-r--r--core/testdata/format/codeBlockNoHtmlEscape.md2
-rw-r--r--core/testdata/format/codeSpan.html2
-rw-r--r--core/testdata/format/companionImplements.md8
-rw-r--r--core/testdata/format/companionObjectExtension.md6
-rw-r--r--core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html12
-rw-r--r--core/testdata/format/deprecated.class.html38
-rw-r--r--core/testdata/format/deprecated.package.html8
-rw-r--r--core/testdata/format/dynamicExtension.md4
-rw-r--r--core/testdata/format/dynamicType.md2
-rw-r--r--core/testdata/format/emptyDescription.md2
-rw-r--r--core/testdata/format/entity.html4
-rw-r--r--core/testdata/format/enumClass.md6
-rw-r--r--core/testdata/format/enumClass.value.md2
-rw-r--r--core/testdata/format/exceptionClass.md4
-rw-r--r--core/testdata/format/exceptionClass.package.md4
-rw-r--r--core/testdata/format/exclInCodeBlock.md2
-rw-r--r--core/testdata/format/extensionFunctionParameter.md4
-rw-r--r--core/testdata/format/extensionScope.md4
-rw-r--r--core/testdata/format/extensionWithDocumentedReceiver.md2
-rw-r--r--core/testdata/format/extensions.class.md6
-rw-r--r--core/testdata/format/extensions.package.md4
-rw-r--r--core/testdata/format/externalReferenceLink.md2
-rw-r--r--core/testdata/format/functionWithDefaultParameter.md2
-rw-r--r--core/testdata/format/functionalTypeWithNamedParameters.html90
-rw-r--r--core/testdata/format/functionalTypeWithNamedParameters.md36
-rw-r--r--core/testdata/format/genericInheritedExtensions.md10
-rw-r--r--core/testdata/format/gfm/listInTableCell.md6
-rw-r--r--core/testdata/format/gfm/sample.md8
-rw-r--r--core/testdata/format/htmlEscaping.html4
-rw-r--r--core/testdata/format/inapplicableExtensionFunctions.md8
-rw-r--r--core/testdata/format/indentedCodeBlock.html2
-rw-r--r--core/testdata/format/indentedCodeBlock.md2
-rw-r--r--core/testdata/format/inheritedCompanionObjectProperties.md16
-rw-r--r--core/testdata/format/inheritedExtensions.md10
-rw-r--r--core/testdata/format/inheritedMembers.md14
-rw-r--r--core/testdata/format/javaCodeInParam.md4
-rw-r--r--core/testdata/format/javaCodeLiteralTags.md4
-rw-r--r--core/testdata/format/javaDeprecated.html4
-rw-r--r--core/testdata/format/javaLinkTag.html10
-rw-r--r--core/testdata/format/javaLinkTagWithLabel.html10
-rw-r--r--core/testdata/format/javaSeeTag.html8
-rw-r--r--core/testdata/format/javaSpaceInAuthor.md4
-rw-r--r--core/testdata/format/javadocHtml.md4
-rw-r--r--core/testdata/format/javadocOrderedList.md4
-rw-r--r--core/testdata/format/jdkLinks.md4
-rw-r--r--core/testdata/format/linkWithLabel.html10
-rw-r--r--core/testdata/format/linkWithStarProjection.html4
-rw-r--r--core/testdata/format/linksInEmphasis.md14
-rw-r--r--core/testdata/format/linksInHeaders.md28
-rw-r--r--core/testdata/format/linksInStrong.md14
-rw-r--r--core/testdata/format/markdownInLinks.html2
-rw-r--r--core/testdata/format/memberExtension.md6
-rw-r--r--core/testdata/format/multiplatform/breadcrumbsInMemberOfMemberOfGroupNode/multiplatform.md2
-rw-r--r--core/testdata/format/multiplatform/groupNode/multiplatform.md6
-rw-r--r--core/testdata/format/multiplatform/groupNode/multiplatform.package.md8
-rw-r--r--core/testdata/format/multiplatform/implied/foo.md16
-rw-r--r--core/testdata/format/multiplatform/merge/multiplatform.package.md4
-rw-r--r--core/testdata/format/multiplatform/mergeMembers/foo.md16
-rw-r--r--core/testdata/format/multiplatform/omitRedundant/foo.md8
-rw-r--r--core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.md4
-rw-r--r--core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.package.md4
-rw-r--r--core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/multiplatform.index.md4
-rw-r--r--core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/multiplatform.package.md4
-rw-r--r--core/testdata/format/multiplatform/simple/multiplatform.package.md6
-rw-r--r--core/testdata/format/multipleTypeParameterConstraints.md13
-rw-r--r--core/testdata/format/nestedLists.md30
-rw-r--r--core/testdata/format/newlineInTableCell.package.md4
-rw-r--r--core/testdata/format/notPublishedTypeAliasAutoExpansion.md6
-rw-r--r--core/testdata/format/nullability.md6
-rw-r--r--core/testdata/format/operatorOverloading.md4
-rw-r--r--