Remove DefaultSamplesTransformer from analysis-kotlin-descriptors…

… and make `kotlinSampleProviderFactory` public (#3110) * Remove `DefaultSamplesTransformer` from `analysis-kotlin-descriptors` * Make `CompilerDescriptorAnalysisPlugin.kotlinSampleProviderFactory` public
Kotlin · Aug 16, 2023 · 34d6927 · 34d6927
1 parent 2269ac5
commit 34d6927
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 192 deletions.
diff --git a/subprojects/analysis-kotlin-descriptors/compiler/api/compiler.api b/subprojects/analysis-kotlin-descriptors/compiler/api/compiler.api
@@ -10,6 +10,7 @@ public final class org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/Comp
 	public final fun getKdocFinder ()Lorg/jetbrains/dokka/plugability/ExtensionPoint;
 	public final fun getKlibService ()Lorg/jetbrains/dokka/plugability/ExtensionPoint;
 	public final fun getKotlinAnalysis ()Lorg/jetbrains/dokka/plugability/ExtensionPoint;
+	public final fun getKotlinSampleProviderFactory ()Lorg/jetbrains/dokka/plugability/Extension;
 	public final fun getMockApplicationHack ()Lorg/jetbrains/dokka/plugability/ExtensionPoint;
 }
 

diff --git a/.../jetbrains/dokka/analysis/kotlin/descriptors/compiler/CompilerDescriptorAnalysisPlugin.kt b/.../jetbrains/dokka/analysis/kotlin/descriptors/compiler/CompilerDescriptorAnalysisPlugin.kt
@@ -56,15 +56,17 @@ class CompilerDescriptorAnalysisPlugin : DokkaPlugin() {
         CoreExtensions.sourceToDocumentableTranslator providing ::DefaultDescriptorToDocumentableTranslator
     }
 
-    internal val defaultSamplesTransformer by extending {
-        CoreExtensions.pageTransformer providing ::DefaultSamplesTransformer
-    }
 
     internal val descriptorFullClassHierarchyBuilder by extending {
         plugin<InternalKotlinAnalysisPlugin>().fullClassHierarchyBuilder providing { DescriptorFullClassHierarchyBuilder() }
     }
 
-    internal val kotlinSampleProviderFactory by extending {
+    /**
+     * StdLib has its own a sample provider
+     * So it should have a possibility to override this extension
+     */
+    @InternalDokkaApi
+    val kotlinSampleProviderFactory by extending {
         plugin<InternalKotlinAnalysisPlugin>().sampleProviderFactory providing ::KotlinSampleProviderFactory
     }
 

diff --git a/...rg/jetbrains/dokka/analysis/kotlin/descriptors/compiler/impl/DefaultSamplesTransformer.kt b/...rg/jetbrains/dokka/analysis/kotlin/descriptors/compiler/impl/DefaultSamplesTransformer.kt
diff --git a/...n/org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/impl/SamplesTransformerImpl.kt b/...n/org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/impl/SamplesTransformerImpl.kt