diff options
Diffstat (limited to 'plugins')
11 files changed, 18 insertions, 25 deletions
diff --git a/plugins/base/src/main/kotlin/DokkaBase.kt b/plugins/base/src/main/kotlin/DokkaBase.kt index fd842dc0..e7cd61a8 100644 --- a/plugins/base/src/main/kotlin/DokkaBase.kt +++ b/plugins/base/src/main/kotlin/DokkaBase.kt @@ -6,9 +6,8 @@ import org.jetbrains.dokka.base.renderers.OutputWriter import org.jetbrains.dokka.base.renderers.html.HtmlRenderer import org.jetbrains.dokka.base.resolvers.DefaultLocationProviderFactory import org.jetbrains.dokka.base.resolvers.LocationProviderFactory -import org.jetbrains.dokka.base.transformers.descriptors.DefaultDescriptorToDocumentationTranslator import org.jetbrains.dokka.base.transformers.documentables.DefaultDocumentableMerger -import org.jetbrains.dokka.base.transformers.documentables.DefaultDocumentablesToPageTranslator +import org.jetbrains.dokka.base.translators.documentables.DefaultDocumentablesToPageTranslator import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter import org.jetbrains.dokka.base.transformers.pages.comments.DocTagToContentConverter import org.jetbrains.dokka.base.transformers.pages.merger.FallbackPageMergerStrategy @@ -16,12 +15,13 @@ import org.jetbrains.dokka.base.transformers.pages.merger.PageMergerStrategy import org.jetbrains.dokka.base.transformers.pages.merger.PageNodeMerger import org.jetbrains.dokka.base.transformers.pages.merger.SameMethodNamePageMergerStrategy import org.jetbrains.dokka.base.transformers.psi.DefaultPsiToDocumentationTranslator +import org.jetbrains.dokka.base.translators.descriptors.DefaultDescriptorToDocumentationTranslator import org.jetbrains.dokka.plugability.DokkaPlugin class DokkaBase : DokkaPlugin() { val pageMergerStrategy by extensionPoint<PageMergerStrategy>() val commentsToContentConverter by extensionPoint<CommentsToContentConverter>() - val locationproviderFactory by extensionPoint<LocationProviderFactory>() + val locationProviderFactory by extensionPoint<LocationProviderFactory>() val outputWriter by extensionPoint<OutputWriter>() val descriptorToDocumentationTranslator by extending(isFallback = true) { @@ -65,7 +65,7 @@ class DokkaBase : DokkaPlugin() { } val locationProvider by extending(isFallback = true) { - locationproviderFactory providing ::DefaultLocationProviderFactory + locationProviderFactory providing ::DefaultLocationProviderFactory } val fileWriter by extending(isFallback = true) { diff --git a/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt b/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt index 951545d2..75034bda 100644 --- a/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt +++ b/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt @@ -117,7 +117,7 @@ abstract class DefaultRenderer<T>( val newRoot = preprocessors.fold(root) { acc, t -> t(acc) } locationProvider = - context.plugin<DokkaBase>().querySingle { locationproviderFactory }.getLocationProvider(newRoot) + context.plugin<DokkaBase>().querySingle { locationProviderFactory }.getLocationProvider(newRoot) root.children<ModulePageNode>().forEach { renderPackageList(it) } diff --git a/plugins/base/src/main/kotlin/transformers/pages/merger/PageNodeMerger.kt b/plugins/base/src/main/kotlin/transformers/pages/merger/PageNodeMerger.kt index 5ecf8d9b..96cd126c 100644 --- a/plugins/base/src/main/kotlin/transformers/pages/merger/PageNodeMerger.kt +++ b/plugins/base/src/main/kotlin/transformers/pages/merger/PageNodeMerger.kt @@ -25,5 +25,5 @@ private fun <T> Iterable<T>.assertSingle(path: List<String>): T = try { single() } catch (e: Exception) { val renderedPath = path.joinToString(separator = "/") - throw IllegalStateException("Page merger is missconfigured. Error for $renderedPath: ${e.message}") + throw IllegalStateException("Page merger is misconfigured. Error for $renderedPath: ${e.message}") }
\ No newline at end of file diff --git a/plugins/base/src/main/kotlin/transformers/descriptors/DefaultDescriptorToDocumentationTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentationTranslator.kt index 1358cef1..bb572034 100644 --- a/plugins/base/src/main/kotlin/transformers/descriptors/DefaultDescriptorToDocumentationTranslator.kt +++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentationTranslator.kt @@ -1,11 +1,10 @@ -package org.jetbrains.dokka.base.transformers.descriptors +package org.jetbrains.dokka.base.translators.descriptors import org.jetbrains.dokka.analysis.DokkaResolutionFacade import org.jetbrains.dokka.links.Callable import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.links.withClass import org.jetbrains.dokka.model.* -import org.jetbrains.dokka.model.ClassKind import org.jetbrains.dokka.model.Enum import org.jetbrains.dokka.model.Function import org.jetbrains.dokka.model.Property @@ -17,12 +16,10 @@ import org.jetbrains.dokka.transformers.descriptors.DescriptorToDocumentationTra import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies import org.jetbrains.kotlin.idea.kdoc.findKDoc -import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe import org.jetbrains.kotlin.resolve.descriptorUtil.getAllSuperclassesWithoutAny import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperInterfaces import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.MemberScope -import org.jetbrains.kotlin.types.KotlinType import kotlin.reflect.KClass class DefaultDescriptorToDocumentationTranslator( diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentablesToPageTranslator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultDocumentablesToPageTranslator.kt index d28791ab..ee3ae995 100644 --- a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentablesToPageTranslator.kt +++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultDocumentablesToPageTranslator.kt @@ -1,10 +1,8 @@ -package org.jetbrains.dokka.base.transformers.documentables +package org.jetbrains.dokka.base.translators.documentables -import org.jetbrains.dokka.CoreExtensions import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter import org.jetbrains.dokka.model.Module import org.jetbrains.dokka.pages.ModulePageNode -import org.jetbrains.dokka.plugability.DokkaContext import org.jetbrains.dokka.transformers.documentation.DocumentablesToPageTranslator import org.jetbrains.dokka.utilities.DokkaLogger diff --git a/plugins/base/src/main/kotlin/transformers/documentables/PageBuilder.kt b/plugins/base/src/main/kotlin/translators/documentables/PageBuilder.kt index 29f39c73..82419a77 100644 --- a/plugins/base/src/main/kotlin/transformers/documentables/PageBuilder.kt +++ b/plugins/base/src/main/kotlin/translators/documentables/PageBuilder.kt @@ -1,4 +1,4 @@ -package org.jetbrains.dokka.base.transformers.documentables +package org.jetbrains.dokka.base.translators.documentables import org.jetbrains.dokka.model.* import org.jetbrains.dokka.model.Enum diff --git a/plugins/base/src/main/kotlin/transformers/documentables/PageContentBuilder.kt b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt index 6ce883b1..48456910 100644 --- a/plugins/base/src/main/kotlin/transformers/documentables/PageContentBuilder.kt +++ b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt @@ -1,4 +1,4 @@ -package org.jetbrains.dokka.base.transformers.documentables +package org.jetbrains.dokka.base.translators.documentables import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter import org.jetbrains.dokka.links.DRI diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts index 923fb48b..a95b612e 100644 --- a/plugins/build.gradle.kts +++ b/plugins/build.gradle.kts @@ -8,8 +8,6 @@ subprojects { // compileOnly(project(":coreDependencies", configuration = "shadow")) // uncomment if IntelliJ does not recognize pacakges from IntelliJ implementation(kotlin("stdlib-jdk8")) - testImplementation(project(":core")) - testImplementation(project(":coreDependencies", configuration = "shadow")) testImplementation(project(":testApi")) testImplementation("junit:junit:4.13") } diff --git a/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaDescriptorToDocumentationTranslator.kt b/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaDescriptorToDocumentationTranslator.kt index 1edf4aa1..618ecfcc 100644 --- a/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaDescriptorToDocumentationTranslator.kt +++ b/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaDescriptorToDocumentationTranslator.kt @@ -1,9 +1,9 @@ package org.jetbrains.dokka.kotlinAsJava import org.jetbrains.dokka.analysis.DokkaResolutionFacade -import org.jetbrains.dokka.base.transformers.descriptors.DRIWithPlatformInfo -import org.jetbrains.dokka.base.transformers.descriptors.DokkaDescriptorVisitor -import org.jetbrains.dokka.base.transformers.descriptors.withEmptyInfo +import org.jetbrains.dokka.base.translators.descriptors.DRIWithPlatformInfo +import org.jetbrains.dokka.base.translators.descriptors.DokkaDescriptorVisitor +import org.jetbrains.dokka.base.translators.descriptors.withEmptyInfo import org.jetbrains.dokka.links.Callable import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.links.withClass diff --git a/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPageBuilder.kt b/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPageBuilder.kt index d4dfdaea..ef6f9c33 100644 --- a/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPageBuilder.kt +++ b/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPageBuilder.kt @@ -1,7 +1,7 @@ package org.jetbrains.dokka.kotlinAsJava -import org.jetbrains.dokka.base.transformers.documentables.DefaultPageBuilder -import org.jetbrains.dokka.base.transformers.documentables.RootContentBuilder +import org.jetbrains.dokka.base.translators.documentables.DefaultPageBuilder +import org.jetbrains.dokka.base.translators.documentables.RootContentBuilder import org.jetbrains.dokka.kotlinAsJava.conversions.asJava import org.jetbrains.dokka.kotlinAsJava.conversions.asStatic import org.jetbrains.dokka.kotlinAsJava.conversions.withClass diff --git a/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPageContentBuilder.kt b/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPageContentBuilder.kt index 87649a83..a8ec7126 100644 --- a/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPageContentBuilder.kt +++ b/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPageContentBuilder.kt @@ -1,8 +1,8 @@ package org.jetbrains.dokka.kotlinAsJava -import org.jetbrains.dokka.base.transformers.documentables.DefaultPageContentBuilder -import org.jetbrains.dokka.base.transformers.documentables.PageContentBuilderFunction -import org.jetbrains.dokka.base.transformers.documentables.type +import org.jetbrains.dokka.base.translators.documentables.DefaultPageContentBuilder +import org.jetbrains.dokka.base.translators.documentables.PageContentBuilderFunction +import org.jetbrains.dokka.base.translators.documentables.type import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.model.Function |