diff options
Diffstat (limited to 'plugins/base/src/main/kotlin/transformers')
4 files changed, 26 insertions, 27 deletions
diff --git a/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt b/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt index f5181f4a..0c88b3c6 100644 --- a/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt +++ b/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt @@ -3,7 +3,7 @@ package org.jetbrains.dokka.base.transformers.pages.comments import org.jetbrains.dokka.DokkaConfiguration.DokkaSourceSet import org.jetbrains.dokka.model.doc.* import org.jetbrains.dokka.model.properties.PropertyContainer -import org.jetbrains.dokka.model.toContentSourceSets +import org.jetbrains.dokka.model.toDisplaySourceSets import org.jetbrains.dokka.pages.* object DocTagToContentConverter : CommentsToContentConverter { @@ -31,7 +31,7 @@ object DocTagToContentConverter : CommentsToContentConverter { buildChildren(docTag), level, dci, - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), styles ) ) @@ -42,7 +42,7 @@ object DocTagToContentConverter : CommentsToContentConverter { buildChildren(docTag), ordered, dci, - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), styles, ((PropertyContainer.empty<ContentNode>()) + SimpleAttr("start", start.toString())) ) @@ -50,7 +50,7 @@ object DocTagToContentConverter : CommentsToContentConverter { fun buildNewLine() = listOf( ContentBreakLine( - sourceSets.toContentSourceSets() + sourceSets.toDisplaySourceSets() ) ) @@ -67,7 +67,7 @@ object DocTagToContentConverter : CommentsToContentConverter { is Ul -> buildList(false) is Ol -> buildList(true, docTag.params["start"]?.toInt() ?: 1) is Li -> listOf( - ContentGroup(buildChildren(docTag), dci, sourceSets.toContentSourceSets(), styles, extra) + ContentGroup(buildChildren(docTag), dci, sourceSets.toDisplaySourceSets(), styles, extra) ) is Br -> buildNewLine() is B -> buildChildren(docTag, setOf(TextStyle.Strong)) @@ -76,7 +76,7 @@ object DocTagToContentConverter : CommentsToContentConverter { ContentGroup( buildChildren(docTag.collapseParagraphs()), dci, - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), styles + setOf(TextStyle.Paragraph), extra ) @@ -86,7 +86,7 @@ object DocTagToContentConverter : CommentsToContentConverter { buildChildren(docTag), docTag.params.getValue("href"), dci, - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), styles ) ) @@ -98,7 +98,7 @@ object DocTagToContentConverter : CommentsToContentConverter { setOf(docTag.dri), ContentKind.Main ), - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), styles ) ) @@ -107,7 +107,7 @@ object DocTagToContentConverter : CommentsToContentConverter { buildChildren(docTag), "", dci, - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), styles ) ) @@ -116,7 +116,7 @@ object DocTagToContentConverter : CommentsToContentConverter { buildChildren(docTag), "", dci, - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), styles ) ) @@ -125,7 +125,7 @@ object DocTagToContentConverter : CommentsToContentConverter { buildChildren(docTag), "", dci, - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), styles ) ) @@ -134,7 +134,7 @@ object DocTagToContentConverter : CommentsToContentConverter { address = docTag.params["href"]!!, altText = docTag.params["alt"], dci = dci, - sourceSets = sourceSets.toContentSourceSets(), + sourceSets = sourceSets.toDisplaySourceSets(), style = styles, extra = extra ) @@ -143,7 +143,7 @@ object DocTagToContentConverter : CommentsToContentConverter { ContentText( "", dci, - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), setOf() ) ) @@ -151,7 +151,7 @@ object DocTagToContentConverter : CommentsToContentConverter { ContentText( docTag.body, dci, - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), styles ) ) @@ -161,7 +161,7 @@ object DocTagToContentConverter : CommentsToContentConverter { buildTableRows(docTag.children.filterIsInstance<Th>(), CommentTable), buildTableRows(docTag.children.filterIsInstance<Tr>(), CommentTable), dci, - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), styles + CommentTable ) ) @@ -169,10 +169,10 @@ object DocTagToContentConverter : CommentsToContentConverter { is Tr -> listOf( ContentGroup( docTag.children.map { - ContentGroup(buildChildren(it), dci, sourceSets.toContentSourceSets(), styles, extra) + ContentGroup(buildChildren(it), dci, sourceSets.toDisplaySourceSets(), styles, extra) }, dci, - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), styles ) ) @@ -180,7 +180,7 @@ object DocTagToContentConverter : CommentsToContentConverter { ContentGroup( buildChildren(docTag, newStyles = styles + ContentStyle.InDocumentationAnchor), dci, - sourceSets.toContentSourceSets(), + sourceSets.toDisplaySourceSets(), styles ) ) diff --git a/plugins/base/src/main/kotlin/transformers/pages/merger/SourceSetMergingPageTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/merger/SourceSetMergingPageTransformer.kt index ca1a7e3b..61e72abf 100644 --- a/plugins/base/src/main/kotlin/transformers/pages/merger/SourceSetMergingPageTransformer.kt +++ b/plugins/base/src/main/kotlin/transformers/pages/merger/SourceSetMergingPageTransformer.kt @@ -1,15 +1,15 @@ package org.jetbrains.dokka.base.transformers.pages.merger import org.jetbrains.dokka.Platform -import org.jetbrains.dokka.model.ContentSourceSet -import org.jetbrains.dokka.model.toContentSourceSets +import org.jetbrains.dokka.model.DisplaySourceSet +import org.jetbrains.dokka.model.toDisplaySourceSets import org.jetbrains.dokka.pages.* import org.jetbrains.dokka.plugability.DokkaContext import org.jetbrains.dokka.transformers.pages.PageTransformer class SourceSetMergingPageTransformer(context: DokkaContext) : PageTransformer { - private val mergedSourceSets = context.configuration.sourceSets.toContentSourceSets() + private val mergedSourceSets = context.configuration.sourceSets.toDisplaySourceSets() .associateBy { sourceSet -> sourceSet.key } override fun invoke(input: RootPageNode): RootPageNode { @@ -33,6 +33,6 @@ class SourceSetMergingPageTransformer(context: DokkaContext) : PageTransformer { } } -private val ContentSourceSet.key get() = SourceSetMergingKey(displayName, analysisPlatform) +private val DisplaySourceSet.key get() = SourceSetMergingKey(name, platform) private data class SourceSetMergingKey(private val displayName: String, private val platform: Platform) diff --git a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt index c7202a0b..2099cab5 100644 --- a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt +++ b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt @@ -9,7 +9,7 @@ import org.jetbrains.dokka.analysis.DokkaResolutionFacade import org.jetbrains.dokka.analysis.EnvironmentAndFacade import org.jetbrains.dokka.base.renderers.sourceSets import org.jetbrains.dokka.links.DRI -import org.jetbrains.dokka.model.ContentSourceSet +import org.jetbrains.dokka.model.DisplaySourceSet import org.jetbrains.dokka.model.doc.Sample import org.jetbrains.dokka.model.properties.PropertyContainer import org.jetbrains.dokka.pages.* @@ -20,7 +20,6 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.utils.PathUtil -import java.io.File abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer { @@ -126,7 +125,7 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer { } private fun contentCode( - sourceSets: Set<ContentSourceSet>, + sourceSets: Set<DisplaySourceSet>, dri: Set<DRI>, content: String, language: String, diff --git a/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt index f0cf8597..8eb7208b 100644 --- a/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt +++ b/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt @@ -9,7 +9,7 @@ import org.jetbrains.dokka.DokkaConfiguration.DokkaSourceSet import org.jetbrains.dokka.analysis.DescriptorDocumentableSource import org.jetbrains.dokka.analysis.PsiDocumentableSource import org.jetbrains.dokka.model.WithExpectActual -import org.jetbrains.dokka.model.toContentSourceSets +import org.jetbrains.dokka.model.toDisplaySourceSets import org.jetbrains.dokka.pages.* import org.jetbrains.dokka.plugability.DokkaContext import org.jetbrains.dokka.transformers.pages.PageTransformer @@ -67,7 +67,7 @@ class SourceLinksTransformer(val context: DokkaContext, val builder: PageContent } }, DCI(node.dri, ContentKind.Source), - node.documentable!!.sourceSets.toContentSourceSets(), + node.documentable!!.sourceSets.toDisplaySourceSets(), style = emptySet(), extra = mainExtra + SimpleAttr.header("Sources") ) |