Move plugin project

Kotlin · Aug 19, 2023 · 5a227fe · 5a227fe
1 parent 853083a
commit 5a227fe
Show file tree

Hide file tree

Showing 43 changed files with 118 additions and 127 deletions.
diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts
@@ -51,7 +51,6 @@ dependencies {
     descriptorsTestConfiguration(project(path = ":subprojects:analysis-kotlin-descriptors", configuration = "shadow"))
 }
 
-
 val symbolsTest = tasks.register<Test>("symbolsTest") {
     useJUnitPlatform {
        excludeTags("onlyDescriptors", "onlyDescriptorsMPP", "javaCode", "usingJDK")

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -67,7 +67,6 @@ include(
     ":subprojects:analysis-kotlin-descriptors:compiler",
     ":subprojects:analysis-kotlin-descriptors:ide",
     ":subprojects:analysis-kotlin-symbols",
-    ":subprojects:analysis-kotlin-symbols:plugin",
     ":subprojects:analysis-markdown-jb",
 
     ":runners:gradle-plugin",

diff --git a/subprojects/analysis-kotlin-symbols/api/analysis-kotlin-symbols.api b/subprojects/analysis-kotlin-symbols/api/analysis-kotlin-symbols.api
@@ -0,0 +1,50 @@
+public abstract interface class org/jetbrains/dokka/analysis/kotlin/symbols/plugin/AnalysisContext : java/io/Closeable {
+	public abstract fun getMainModule ()Lorg/jetbrains/kotlin/analysis/project/structure/KtSourceModule;
+	public abstract fun getProject ()Lcom/intellij/openapi/project/Project;
+}
+
+public abstract class org/jetbrains/dokka/analysis/kotlin/symbols/plugin/KotlinAnalysis : java/io/Closeable {
+	public fun <init> ()V
+	public fun <init> (Lorg/jetbrains/dokka/analysis/kotlin/symbols/plugin/KotlinAnalysis;)V
+	public synthetic fun <init> (Lorg/jetbrains/dokka/analysis/kotlin/symbols/plugin/KotlinAnalysis;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun get (Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;)Lorg/jetbrains/dokka/analysis/kotlin/symbols/plugin/AnalysisContext;
+}
+
+public final class org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin : org/jetbrains/dokka/plugability/DokkaPlugin {
+	public fun <init> ()V
+	public final fun getKotlinAnalysis ()Lorg/jetbrains/dokka/plugability/ExtensionPoint;
+	public final fun getSymbolToDocumentableTranslator ()Lorg/jetbrains/dokka/plugability/Extension;
+}
+
+public final class org/jetbrains/dokka/analysis/kotlin/symbols/services/KotlinAnalysisSourceRootsExtractor : org/jetbrains/dokka/analysis/java/SourceRootsExtractor {
+	public fun <init> ()V
+	public fun extract (Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;Lorg/jetbrains/dokka/plugability/DokkaContext;)Ljava/util/List;
+}
+
+public class org/jetbrains/dokka/analysis/kotlin/symbols/services/KotlinSampleProvider : org/jetbrains/dokka/analysis/kotlin/internal/SampleProvider {
+	public fun <init> (Lorg/jetbrains/dokka/plugability/DokkaContext;)V
+	public fun close ()V
+	public final fun getContext ()Lorg/jetbrains/dokka/plugability/DokkaContext;
+	public final fun getKotlinAnalysis ()Lorg/jetbrains/dokka/analysis/kotlin/symbols/plugin/KotlinAnalysis;
+	public fun getSample (Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;Ljava/lang/String;)Lorg/jetbrains/dokka/analysis/kotlin/internal/SampleProvider$SampleSnippet;
+	protected fun processBody (Lcom/intellij/psi/PsiElement;)Ljava/lang/String;
+	protected fun processImports (Lcom/intellij/psi/PsiElement;)Ljava/lang/String;
+}
+
+public final class org/jetbrains/dokka/analysis/kotlin/symbols/services/KotlinSampleProviderFactory : org/jetbrains/dokka/analysis/kotlin/internal/SampleProviderFactory {
+	public fun <init> (Lorg/jetbrains/dokka/plugability/DokkaContext;)V
+	public fun build ()Lorg/jetbrains/dokka/analysis/kotlin/internal/SampleProvider;
+	public final fun getContext ()Lorg/jetbrains/dokka/plugability/DokkaContext;
+}
+
+public final class org/jetbrains/dokka/analysis/kotlin/symbols/services/SymbolFullClassHierarchyBuilder : org/jetbrains/dokka/analysis/kotlin/internal/FullClassHierarchyBuilder {
+	public fun <init> ()V
+	public fun build (Lorg/jetbrains/dokka/model/DModule;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class org/jetbrains/dokka/analysis/kotlin/symbols/translators/DefaultSymbolToDocumentableTranslator : org/jetbrains/dokka/transformers/sources/AsyncSourceToDocumentableTranslator {
+	public fun <init> (Lorg/jetbrains/dokka/plugability/DokkaContext;)V
+	public fun invoke (Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;Lorg/jetbrains/dokka/plugability/DokkaContext;)Lorg/jetbrains/dokka/model/DModule;
+	public fun invokeSuspending (Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;Lorg/jetbrains/dokka/plugability/DokkaContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
diff --git a/subprojects/analysis-kotlin-symbols/build.gradle.kts b/subprojects/analysis-kotlin-symbols/build.gradle.kts
@@ -8,7 +8,74 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.subprojects.analysisKotlinSymbols.plugin)
+    compileOnly(projects.core)
+    compileOnly(projects.subprojects.analysisKotlinApi)
+
+    implementation(projects.subprojects.analysisMarkdownJb)
+    implementation(projects.subprojects.analysisJavaPsi)
+
+
+    // ----------- IDE dependencies ----------------------------------------------------------------------------
+
+    listOf(
+        libs.intellij.platform.util.rt,
+        libs.intellij.platform.util.api,
+        libs.intellij.java.psi.api,
+        libs.intellij.java.psi.impl
+    ).forEach {
+        runtimeOnly(it) { isTransitive = false }
+    }
+
+    implementation(libs.intellij.java.psi.api) { isTransitive = false }
+
+
+    // TODO move to toml
+    listOf(
+        "com.jetbrains.intellij.platform:util-class-loader",
+        "com.jetbrains.intellij.platform:util-text-matching",
+        "com.jetbrains.intellij.platform:util-base",
+        "com.jetbrains.intellij.platform:util-xml-dom",
+        "com.jetbrains.intellij.platform:core-impl",
+        "com.jetbrains.intellij.platform:extensions",
+    ).forEach {
+        runtimeOnly("$it:213.7172.25") { isTransitive = false }
+    }
+
+    implementation("com.jetbrains.intellij.platform:core:213.7172.25") {
+        isTransitive = false
+    } // for Standalone prototype
+
+    // ----------- Analysis dependencies ----------------------------------------------------------------------------
+
+    listOf(
+        libs.kotlin.high.level.api.api,
+        libs.kotlin.analysis.api.standalone,
+        libs.kotlin.high.level.api.impl // for Standalone prototype
+    ).forEach {
+        implementation(it) {
+            isTransitive = false // see KTIJ-19820
+        }
+    }
+    listOf(
+        libs.kotlin.high.level.api.impl,
+        libs.kotlin.high.level.api.fir,
+        libs.kotlin.high.level.api.fe10,
+        libs.kotlin.low.level.api.fir,
+        libs.kotlin.analysis.project.structure,
+        libs.kotlin.analysis.api.providers,
+        libs.kotlin.symbol.light.classes
+    ).forEach {
+        runtimeOnly(it) {
+            isTransitive = false // see KTIJ-19820
+        }
+    }
+    runtimeOnly(libs.kotlinx.collections.immutable)
+    implementation(libs.kotlin.compiler.k2) {
+        isTransitive = false
+    }
+
+    // TODO [beresnev] get rid of it
+    compileOnly(libs.kotlinx.coroutines.core)
 }
 
 tasks {

diff --git a/subprojects/analysis-kotlin-symbols/plugin/api/plugin.api b/subprojects/analysis-kotlin-symbols/plugin/api/plugin.api
diff --git a/subprojects/analysis-kotlin-symbols/plugin/build.gradle.kts b/subprojects/analysis-kotlin-symbols/plugin/build.gradle.kts
diff --git a/...lysis/kotlin/symbols/kdoc/KDocProvider.kt → ...lysis/kotlin/symbols/kdoc/KDocProvider.kt b/...lysis/kotlin/symbols/kdoc/KDocProvider.kt → ...lysis/kotlin/symbols/kdoc/KDocProvider.kt
diff --git a/...kotlin/symbols/kdoc/KdocMarkdownParser.kt → ...kotlin/symbols/kdoc/KdocMarkdownParser.kt b/...kotlin/symbols/kdoc/KdocMarkdownParser.kt → ...kotlin/symbols/kdoc/KdocMarkdownParser.kt
diff --git a/...is/kotlin/symbols/kdoc/ResolveKDocLink.kt → ...is/kotlin/symbols/kdoc/ResolveKDocLink.kt b/...is/kotlin/symbols/kdoc/ResolveKDocLink.kt → ...is/kotlin/symbols/kdoc/ResolveKDocLink.kt
diff --git a/...lin/symbols/kdoc/SyntheticKDocProvider.kt → ...lin/symbols/kdoc/SyntheticKDocProvider.kt b/...lin/symbols/kdoc/SyntheticKDocProvider.kt → ...lin/symbols/kdoc/SyntheticKDocProvider.kt
diff --git a/...oc/java/DescriptorDocumentationContent.kt → ...oc/java/DescriptorDocumentationContent.kt b/...oc/java/DescriptorDocumentationContent.kt → ...oc/java/DescriptorDocumentationContent.kt
diff --git a/...java/DescriptorKotlinDocCommentCreator.kt → ...java/DescriptorKotlinDocCommentCreator.kt b/...java/DescriptorKotlinDocCommentCreator.kt → ...java/DescriptorKotlinDocCommentCreator.kt
diff --git a/...lin/symbols/kdoc/java/KotlinDocComment.kt → ...lin/symbols/kdoc/java/KotlinDocComment.kt b/...lin/symbols/kdoc/java/KotlinDocComment.kt → ...lin/symbols/kdoc/java/KotlinDocComment.kt
diff --git a/...mbols/kdoc/java/KotlinDocCommentParser.kt → ...mbols/kdoc/java/KotlinDocCommentParser.kt b/...mbols/kdoc/java/KotlinDocCommentParser.kt → ...mbols/kdoc/java/KotlinDocCommentParser.kt
diff --git a/...ava/KotlinInheritDocTagContentProvider.kt → ...ava/KotlinInheritDocTagContentProvider.kt b/...ava/KotlinInheritDocTagContentProvider.kt → ...ava/KotlinInheritDocTagContentProvider.kt
diff --git a/...s/IllegalModuleAndPackageDocumentation.kt → ...s/IllegalModuleAndPackageDocumentation.kt b/...s/IllegalModuleAndPackageDocumentation.kt → ...s/IllegalModuleAndPackageDocumentation.kt
diff --git a/...duledocs/ModuleAndPackageDocumentation.kt → ...duledocs/ModuleAndPackageDocumentation.kt b/...duledocs/ModuleAndPackageDocumentation.kt → ...duledocs/ModuleAndPackageDocumentation.kt
diff --git a/.../ModuleAndPackageDocumentationFragment.kt → .../ModuleAndPackageDocumentationFragment.kt b/.../ModuleAndPackageDocumentationFragment.kt → .../ModuleAndPackageDocumentationFragment.kt
diff --git a/...eAndPackageDocumentationParsingContext.kt → ...eAndPackageDocumentationParsingContext.kt b/...eAndPackageDocumentationParsingContext.kt → ...eAndPackageDocumentationParsingContext.kt
diff --git a/...cs/ModuleAndPackageDocumentationReader.kt → ...cs/ModuleAndPackageDocumentationReader.kt b/...cs/ModuleAndPackageDocumentationReader.kt → ...cs/ModuleAndPackageDocumentationReader.kt
diff --git a/...cs/ModuleAndPackageDocumentationSource.kt → ...cs/ModuleAndPackageDocumentationSource.kt b/...cs/ModuleAndPackageDocumentationSource.kt → ...cs/ModuleAndPackageDocumentationSource.kt
diff --git a/...ocs/parseModuleAndPackageDocumentation.kt → ...ocs/parseModuleAndPackageDocumentation.kt b/...ocs/parseModuleAndPackageDocumentation.kt → ...ocs/parseModuleAndPackageDocumentation.kt
diff --git a/...ModuleAndPackageDocumentationFragments.kt → ...ModuleAndPackageDocumentationFragments.kt b/...ModuleAndPackageDocumentationFragments.kt → ...ModuleAndPackageDocumentationFragments.kt
diff --git a/.../kotlin/symbols/plugin/AnalysisContext.kt → .../kotlin/symbols/plugin/AnalysisContext.kt b/.../kotlin/symbols/plugin/AnalysisContext.kt → .../kotlin/symbols/plugin/AnalysisContext.kt
diff --git a/...s/kotlin/symbols/plugin/KotlinAnalysis.kt → ...s/kotlin/symbols/plugin/KotlinAnalysis.kt b/...s/kotlin/symbols/plugin/KotlinAnalysis.kt → ...s/kotlin/symbols/plugin/KotlinAnalysis.kt
diff --git a/...n/symbols/plugin/SymbolsAnalysisPlugin.kt → ...n/symbols/plugin/SymbolsAnalysisPlugin.kt b/...n/symbols/plugin/SymbolsAnalysisPlugin.kt → ...n/symbols/plugin/SymbolsAnalysisPlugin.kt
diff --git a/...services/KotlinAnalysisProjectProvider.kt → ...services/KotlinAnalysisProjectProvider.kt b/...services/KotlinAnalysisProjectProvider.kt → ...services/KotlinAnalysisProjectProvider.kt
diff --git a/...ces/KotlinAnalysisSourceRootsExtractor.kt → ...ces/KotlinAnalysisSourceRootsExtractor.kt b/...ces/KotlinAnalysisSourceRootsExtractor.kt → ...ces/KotlinAnalysisSourceRootsExtractor.kt
diff --git a/...KotlinDocumentableSourceLanguageParser.kt → ...KotlinDocumentableSourceLanguageParser.kt b/...KotlinDocumentableSourceLanguageParser.kt → ...KotlinDocumentableSourceLanguageParser.kt
diff --git a/.../symbols/services/KotlinSampleProvider.kt → .../symbols/services/KotlinSampleProvider.kt b/.../symbols/services/KotlinSampleProvider.kt → .../symbols/services/KotlinSampleProvider.kt
diff --git a/...mbols/services/KtPsiDocumentableSource.kt → ...mbols/services/KtPsiDocumentableSource.kt b/...mbols/services/KtPsiDocumentableSource.kt → ...mbols/services/KtPsiDocumentableSource.kt
diff --git a/...es/SymbolExternalDocumentablesProvider.kt → ...es/SymbolExternalDocumentablesProvider.kt b/...es/SymbolExternalDocumentablesProvider.kt → ...es/SymbolExternalDocumentablesProvider.kt
diff --git a/...rvices/SymbolFullClassHierarchyBuilder.kt → ...rvices/SymbolFullClassHierarchyBuilder.kt b/...rvices/SymbolFullClassHierarchyBuilder.kt → ...rvices/SymbolFullClassHierarchyBuilder.kt
diff --git a/...es/SymbolSyntheticDocumentableDetector.kt → ...es/SymbolSyntheticDocumentableDetector.kt b/...es/SymbolSyntheticDocumentableDetector.kt → ...es/SymbolSyntheticDocumentableDetector.kt
diff --git a/...mbols/translators/AnnotationTranslator.kt → ...mbols/translators/AnnotationTranslator.kt b/...mbols/translators/AnnotationTranslator.kt → ...mbols/translators/AnnotationTranslator.kt
diff --git a/.../kotlin/symbols/translators/DRIFactory.kt → .../kotlin/symbols/translators/DRIFactory.kt b/.../kotlin/symbols/translators/DRIFactory.kt → .../kotlin/symbols/translators/DRIFactory.kt
diff --git a/.../DefaultSymbolToDocumentableTranslator.kt → .../DefaultSymbolToDocumentableTranslator.kt b/.../DefaultSymbolToDocumentableTranslator.kt → .../DefaultSymbolToDocumentableTranslator.kt
diff --git a/...in/symbols/translators/TranslatorError.kt → ...in/symbols/translators/TranslatorError.kt b/...in/symbols/translators/TranslatorError.kt → ...in/symbols/translators/TranslatorError.kt
diff --git a/...mbols/translators/TypeReferenceFactory.kt → ...mbols/translators/TypeReferenceFactory.kt b/...mbols/translators/TypeReferenceFactory.kt → ...mbols/translators/TypeReferenceFactory.kt
diff --git a/...lin/symbols/translators/TypeTranslator.kt → ...lin/symbols/translators/TypeTranslator.kt b/...lin/symbols/translators/TypeTranslator.kt → ...lin/symbols/translators/TypeTranslator.kt
diff --git a/...lin/symbols/utils/CollectionExtensions.kt → ...lin/symbols/utils/CollectionExtensions.kt b/...lin/symbols/utils/CollectionExtensions.kt → ...lin/symbols/utils/CollectionExtensions.kt
diff --git a/...lysis/kotlin/symbols/utils/isException.kt → ...lysis/kotlin/symbols/utils/isException.kt b/...lysis/kotlin/symbols/utils/isException.kt → ...lysis/kotlin/symbols/utils/isException.kt
diff --git a/...g.jetbrains.dokka.plugability.DokkaPlugin → ...g.jetbrains.dokka.plugability.DokkaPlugin b/...g.jetbrains.dokka.plugability.DokkaPlugin → ...g.jetbrains.dokka.plugability.DokkaPlugin