From 9559158bfeeb274e9ccf1b4563f1b23b42afc493 Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Wed, 5 Jul 2023 10:04:55 +0200 Subject: Decompose Kotlin/Java analysis (#3034) * Extract analysis into separate modules --- plugins/base/api/base.api | 195 +-- plugins/base/base-test-utils/build.gradle.kts | 6 +- .../src/main/kotlin/testRunner/baseTestApi.kt | 5 +- plugins/base/build.gradle.kts | 17 +- .../main/components/search/dokkaFuzzyFilter.tsx | 4 +- .../frontend/src/main/components/search/search.tsx | 8 +- .../src/main/components/utils/requests.tsx | 4 +- plugins/base/src/main/kotlin/DokkaBase.kt | 71 +- .../base/src/main/kotlin/parsers/MarkdownParser.kt | 604 ---------- plugins/base/src/main/kotlin/parsers/Parser.kt | 131 -- .../factories/DocTagsFromIElementFactory.kt | 67 -- .../parsers/factories/DocTagsFromStringFactory.kt | 77 -- .../IllegalModuleAndPackageDocumentation.kt | 7 - .../ModuleAndPackageDocumentation.kt | 11 - .../ModuleAndPackageDocumentationFragment.kt | 10 - .../ModuleAndPackageDocumentationParsingContext.kt | 64 - .../ModuleAndPackageDocumentationSource.kt | 14 - .../parseModuleAndPackageDocumentation.kt | 12 - .../parseModuleAndPackageDocumentationFragments.kt | 55 - .../main/kotlin/renderers/PackageListService.kt | 5 +- .../src/main/kotlin/renderers/html/HtmlRenderer.kt | 9 +- .../renderers/html/NavigationDataProvider.kt | 18 +- .../main/kotlin/renderers/html/NavigationPage.kt | 2 + .../kotlin/renderers/html/htmlPreprocessors.kt | 2 +- .../src/main/kotlin/renderers/preprocessors.kt | 7 +- .../javadoc/JavadocExternalLocationProvider.kt | 5 +- .../main/kotlin/signatures/JvmSignatureUtils.kt | 6 +- .../kotlin/signatures/KotlinSignatureProvider.kt | 14 +- .../main/kotlin/signatures/KotlinSignatureUtils.kt | 4 +- .../documentables/DefaultDocumentableMerger.kt | 4 +- .../DeprecatedDocumentableFilterTransformer.kt | 2 +- .../DocumentableVisibilityFilterTransformer.kt | 4 +- .../documentables/ExtensionExtractorTransformer.kt | 6 +- ...nheritedEntriesDocumentableFilterTransformer.kt | 5 +- .../InheritorsExtractorTransformer.kt | 2 +- .../ModuleAndPackageDocumentationReader.kt | 107 -- .../ModuleAndPackageDocumentationTransformer.kt | 12 +- .../documentables/ReportUndocumentedTransformer.kt | 41 +- .../documentables/SuppressTagDocumentableFilter.kt | 4 +- .../utils/FullClassHierarchyBuilder.kt | 84 -- .../pages/annotations/SinceKotlinTransformer.kt | 11 +- .../pages/comments/CommentsToContentConverter.kt | 4 +- .../pages/comments/DocTagToContentConverter.kt | 7 +- .../merger/SourceSetMergingPageTransformer.kt | 4 +- .../pages/samples/DefaultSamplesTransformer.kt | 36 - .../pages/samples/SamplesTransformer.kt | 148 --- .../pages/sourcelinks/SourceLinksTransformer.kt | 37 +- .../kotlin/translators/CollectionExtensions.kt | 12 - .../main/kotlin/translators/annotationsValue.kt | 3 - .../DefaultDescriptorToDocumentableTranslator.kt | 1250 -------------------- .../DefaultExternalDocumentablesProvider.kt | 42 - .../DescriptorAccessorConventionUtil.kt | 145 --- .../descriptors/ExternalClasslikesTranslator.kt | 12 - .../descriptors/ExternalDocumentablesProvider.kt | 22 - .../SyntheticDescriptorDocumentationProvider.kt | 47 - .../DefaultDocumentableToPageTranslator.kt | 7 +- .../documentables/DefaultPageCreator.kt | 18 +- .../documentables/DeprecationSectionCreator.kt | 2 +- .../documentables/DescriptionSections.kt | 14 +- .../documentables/briefFromContentNodes.kt | 12 +- .../documentables/documentableLanguage.kt | 15 - .../src/main/kotlin/translators/isException.kt | 18 - .../translators/parseWithNormalisedSpaces.kt | 56 - .../psi/DefaultPsiToDocumentableTranslator.kt | 863 -------------- .../translators/psi/PsiAccessorConventionUtil.kt | 94 -- .../main/kotlin/translators/psi/PsiInheritance.kt | 47 - .../psi/SynheticElementDocumentationProvider.kt | 39 - .../translators/psi/parsers/InheritDocResolver.kt | 129 -- .../translators/psi/parsers/JavadocParser.kt | 511 -------- .../kotlin/translators/psi/parsers/JavadocTag.kt | 32 - .../translators/psi/parsers/PsiCommentsUtils.kt | 146 --- .../kotlin/translators/psi/parsers/exceptionTag.kt | 14 - .../src/main/kotlin/utils/CollectionExtensions.kt | 12 + .../src/main/kotlin/utils/NoopIntellijLogger.kt | 43 - plugins/base/src/test/kotlin/basic/DRITest.kt | 2 +- .../base/src/test/kotlin/basic/DokkaBasicTests.kt | 3 +- .../src/test/kotlin/basic/FailOnWarningTest.kt | 2 +- .../annotations/ContentForAnnotationsTest.kt | 9 +- .../content/annotations/KotlinDeprecatedTest.kt | 4 +- .../kotlin/content/annotations/SinceKotlinTest.kt | 4 +- .../content/exceptions/ContentForExceptions.kt | 5 +- .../content/inheritors/ContentForInheritorsTest.kt | 5 +- .../kotlin/content/params/ContentForParamsTest.kt | 2 +- .../content/signatures/ContentForSignaturesTest.kt | 5 +- .../base/src/test/kotlin/enums/JavaEnumsTest.kt | 3 - .../base/src/test/kotlin/enums/KotlinEnumsTest.kt | 12 +- .../test/kotlin/expectActuals/ExpectActualsTest.kt | 5 +- .../src/test/kotlin/filter/JavaFileFilterTest.kt | 1 - .../filter/KotlinArrayDocumentableReplacerTest.kt | 10 +- .../kotlin/linkableContent/LinkableContentTest.kt | 42 +- .../test/kotlin/linking/EnumValuesLinkingTest.kt | 15 +- .../AndroidExternalLocationProviderTest.kt | 2 +- .../DefaultExternalLocationProviderTest.kt | 2 +- .../Dokka010ExternalLocationProviderTest.kt | 2 +- .../locationProvider/DokkaLocationProviderTest.kt | 7 +- .../JavadocExternalLocationProviderTest.kt | 7 +- .../locationProvider/MultiModuleLinkingTest.kt | 3 +- plugins/base/src/test/kotlin/markdown/KDocTest.kt | 4 +- plugins/base/src/test/kotlin/markdown/LinkTest.kt | 6 +- .../base/src/test/kotlin/markdown/ParserTest.kt | 99 +- plugins/base/src/test/kotlin/model/ClassesTest.kt | 2 +- plugins/base/src/test/kotlin/model/CommentTest.kt | 6 +- .../base/src/test/kotlin/model/ExtensionsTest.kt | 9 +- .../base/src/test/kotlin/model/InheritorsTest.kt | 435 ++++--- .../kotlin/model/MultiLanguageInheritanceTest.kt | 7 +- plugins/base/src/test/kotlin/model/PropertyTest.kt | 3 - .../kotlin/multiplatform/BasicMultiplatformTest.kt | 2 +- .../test/kotlin/pageMerger/PageNodeMergerTest.kt | 7 +- .../src/test/kotlin/parsers/JavadocParserTest.kt | 72 +- ...seModuleAndPackageDocumentationFragmentsTest.kt | 282 ----- .../kotlin/renderers/html/GroupWrappingTest.kt | 2 +- .../renderers/html/HtmlRenderingOnlyTestBase.kt | 4 +- .../kotlin/renderers/html/NavigationIconTest.kt | 2 +- .../test/kotlin/renderers/html/NavigationTest.kt | 2 +- .../FunctionalTypeConstructorsSignatureTest.kt | 3 +- .../kotlin/signatures/ObviousTypeSkippingTest.kt | 2 +- .../kotlin/signatures/VarianceSignatureTest.kt | 1 - .../PageTransformerBuilderTest.kt | 5 +- .../transformers/CommentsToContentConverterTest.kt | 3 +- ...textModuleAndPackageDocumentationReaderTest1.kt | 28 +- ...textModuleAndPackageDocumentationReaderTest3.kt | 8 +- .../test/kotlin/transformers/DivisionSwitchTest.kt | 7 +- ...ntentModuleAndPackageDocumentationReaderTest.kt | 12 +- .../MergeImplicitExpectActualDeclarationsTest.kt | 5 +- ...leAndPackageDocumentationTransformerUnitTest.kt | 36 +- .../ReportUndocumentedTransformerTest.kt | 2 +- .../transformers/SourceLinkTransformerTest.kt | 4 +- ...nfigurationDocumentableFilterTransformerTest.kt | 2 +- .../kotlin/translators/AccessorMethodNamingTest.kt | 5 +- .../base/src/test/kotlin/translators/Bug1341.kt | 2 +- .../DefaultPsiToDocumentableTranslatorTest.kt | 137 ++- .../translators/ExternalDocumentablesTest.kt | 19 +- .../kotlin/translators/JavadocInheritDocsTest.kt | 5 +- .../translators/JavadocInheritedDocTagsTest.kt | 13 +- .../test/kotlin/translators/JavadocParserTest.kt | 4 +- plugins/base/src/test/kotlin/translators/utils.kt | 1 - plugins/base/src/test/kotlin/utils/contentUtils.kt | 7 +- 137 files changed, 737 insertions(+), 6227 deletions(-) delete mode 100644 plugins/base/src/main/kotlin/parsers/MarkdownParser.kt delete mode 100644 plugins/base/src/main/kotlin/parsers/Parser.kt delete mode 100644 plugins/base/src/main/kotlin/parsers/factories/DocTagsFromIElementFactory.kt delete mode 100644 plugins/base/src/main/kotlin/parsers/factories/DocTagsFromStringFactory.kt delete mode 100644 plugins/base/src/main/kotlin/parsers/moduleAndPackage/IllegalModuleAndPackageDocumentation.kt delete mode 100644 plugins/base/src/main/kotlin/parsers/moduleAndPackage/ModuleAndPackageDocumentation.kt delete mode 100644 plugins/base/src/main/kotlin/parsers/moduleAndPackage/ModuleAndPackageDocumentationFragment.kt delete mode 100644 plugins/base/src/main/kotlin/parsers/moduleAndPackage/ModuleAndPackageDocumentationParsingContext.kt delete mode 100644 plugins/base/src/main/kotlin/parsers/moduleAndPackage/ModuleAndPackageDocumentationSource.kt delete mode 100644 plugins/base/src/main/kotlin/parsers/moduleAndPackage/parseModuleAndPackageDocumentation.kt delete mode 100644 plugins/base/src/main/kotlin/parsers/moduleAndPackage/parseModuleAndPackageDocumentationFragments.kt delete mode 100644 plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationReader.kt delete mode 100644 plugins/base/src/main/kotlin/transformers/documentables/utils/FullClassHierarchyBuilder.kt delete mode 100644 plugins/base/src/main/kotlin/transformers/pages/samples/DefaultSamplesTransformer.kt delete mode 100644 plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt delete mode 100644 plugins/base/src/main/kotlin/translators/CollectionExtensions.kt delete mode 100644 plugins/base/src/main/kotlin/translators/annotationsValue.kt delete mode 100644 plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt delete mode 100644 plugins/base/src/main/kotlin/translators/descriptors/DefaultExternalDocumentablesProvider.kt delete mode 100644 plugins/base/src/main/kotlin/translators/descriptors/DescriptorAccessorConventionUtil.kt delete mode 100644 plugins/base/src/main/kotlin/translators/descriptors/ExternalClasslikesTranslator.kt delete mode 100644 plugins/base/src/main/kotlin/translators/descriptors/ExternalDocumentablesProvider.kt delete mode 100644 plugins/base/src/main/kotlin/translators/descriptors/SyntheticDescriptorDocumentationProvider.kt delete mode 100644 plugins/base/src/main/kotlin/translators/documentables/documentableLanguage.kt delete mode 100644 plugins/base/src/main/kotlin/translators/isException.kt delete mode 100644 plugins/base/src/main/kotlin/translators/parseWithNormalisedSpaces.kt delete mode 100644 plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt delete mode 100644 plugins/base/src/main/kotlin/translators/psi/PsiAccessorConventionUtil.kt delete mode 100644 plugins/base/src/main/kotlin/translators/psi/PsiInheritance.kt delete mode 100644 plugins/base/src/main/kotlin/translators/psi/SynheticElementDocumentationProvider.kt delete mode 100644 plugins/base/src/main/kotlin/translators/psi/parsers/PsiCommentsUtils.kt delete mode 100644 plugins/base/src/main/kotlin/translators/psi/parsers/exceptionTag.kt create mode 100644 plugins/base/src/main/kotlin/utils/CollectionExtensions.kt delete mode 100644 plugins/base/src/main/kotlin/utils/NoopIntellijLogger.kt delete mode 100644 plugins/base/src/test/kotlin/parsers/ParseModuleAndPackageDocumentationFragmentsTest.kt (limited to 'plugins/base') diff --git a/plugins/base/api/base.api b/plugins/base/api/base.api index 0af1b46a..26787734 100644 --- a/plugins/base/api/base.api +++ b/plugins/base/api/base.api @@ -6,12 +6,7 @@ public final class org/jetbrains/dokka/base/DokkaBase : org/jetbrains/dokka/plug public final fun getCommentsToContentConverter ()Lorg/jetbrains/dokka/plugability/ExtensionPoint; public final fun getCustomResourceInstaller ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getCustomTagContentProvider ()Lorg/jetbrains/dokka/plugability/ExtensionPoint; - public final fun getDefaultExternalClasslikesTranslator ()Lorg/jetbrains/dokka/plugability/Extension; - public final fun getDefaultExternalDocumentablesProvider ()Lorg/jetbrains/dokka/plugability/Extension; - public final fun getDefaultKotlinAnalysis ()Lorg/jetbrains/dokka/plugability/Extension; - public final fun getDefaultSamplesTransformer ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getDeprecatedDocumentableFilter ()Lorg/jetbrains/dokka/plugability/Extension; - public final fun getDescriptorToDocumentableTranslator ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getDocTagToContentConverter ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getDocumentableMerger ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getDocumentableToPageTranslator ()Lorg/jetbrains/dokka/plugability/Extension; @@ -20,8 +15,6 @@ public final class org/jetbrains/dokka/base/DokkaBase : org/jetbrains/dokka/plug public final fun getEmptyModulesFilter ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getEmptyPackagesFilter ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getExtensionsExtractor ()Lorg/jetbrains/dokka/plugability/Extension; - public final fun getExternalClasslikesTranslator ()Lorg/jetbrains/dokka/plugability/ExtensionPoint; - public final fun getExternalDocumentablesProvider ()Lorg/jetbrains/dokka/plugability/ExtensionPoint; public final fun getExternalLocationProviderFactory ()Lorg/jetbrains/dokka/plugability/ExtensionPoint; public final fun getFallbackMerger ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getFileWriter ()Lorg/jetbrains/dokka/plugability/Extension; @@ -31,7 +24,6 @@ public final class org/jetbrains/dokka/base/DokkaBase : org/jetbrains/dokka/plug public final fun getInheritedEntriesVisbilityFilter ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getInheritorsExtractor ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getJavadocLocationProvider ()Lorg/jetbrains/dokka/plugability/Extension; - public final fun getKotlinAnalysis ()Lorg/jetbrains/dokka/plugability/ExtensionPoint; public final fun getKotlinArrayDocumentableReplacer ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getKotlinSignatureProvider ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getLocationProvider ()Lorg/jetbrains/dokka/plugability/Extension; @@ -45,7 +37,6 @@ public final class org/jetbrains/dokka/base/DokkaBase : org/jetbrains/dokka/plug public final fun getPageMergerStrategy ()Lorg/jetbrains/dokka/plugability/ExtensionPoint; public final fun getPathToRootConsumer ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getPreMergeDocumentableTransformer ()Lorg/jetbrains/dokka/plugability/ExtensionPoint; - public final fun getPsiToDocumentableTranslator ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getReplaceVersionConsumer ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getResolveLinkConsumer ()Lorg/jetbrains/dokka/plugability/Extension; public final fun getRootCreator ()Lorg/jetbrains/dokka/plugability/Extension; @@ -120,104 +111,6 @@ public final class org/jetbrains/dokka/base/generation/SingleModuleGeneration : public final fun validityCheck (Lorg/jetbrains/dokka/plugability/DokkaContext;)V } -public class org/jetbrains/dokka/base/parsers/MarkdownParser : org/jetbrains/dokka/base/parsers/Parser { - public static final field Companion Lorg/jetbrains/dokka/base/parsers/MarkdownParser$Companion; - public fun (Lkotlin/jvm/functions/Function1;Ljava/lang/String;)V - public fun parseStringToDocNode (Ljava/lang/String;)Lorg/jetbrains/dokka/model/doc/DocTag; - public fun parseTagWithBody (Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/dokka/model/doc/TagWrapper; - public fun preparse (Ljava/lang/String;)Ljava/lang/String; -} - -public final class org/jetbrains/dokka/base/parsers/MarkdownParser$Companion { - public final fun fqName (Lorg/jetbrains/dokka/links/DRI;)Ljava/lang/String; - public final fun parseFromKDocTag (Lorg/jetbrains/kotlin/kdoc/psi/impl/KDocTag;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Z)Lorg/jetbrains/dokka/model/doc/DocumentationNode; - public static synthetic fun parseFromKDocTag$default (Lorg/jetbrains/dokka/base/parsers/MarkdownParser$Companion;Lorg/jetbrains/kotlin/kdoc/psi/impl/KDocTag;Lkotlin/jvm/functions/Function1;Ljava/lang/String;ZILjava/lang/Object;)Lorg/jetbrains/dokka/model/doc/DocumentationNode; -} - -public abstract class org/jetbrains/dokka/base/parsers/Parser { - public fun ()V - public fun parse (Ljava/lang/String;)Lorg/jetbrains/dokka/model/doc/DocumentationNode; - public abstract fun parseStringToDocNode (Ljava/lang/String;)Lorg/jetbrains/dokka/model/doc/DocTag; - public fun parseTagWithBody (Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/dokka/model/doc/TagWrapper; - public abstract fun preparse (Ljava/lang/String;)Ljava/lang/String; -} - -public final class org/jetbrains/dokka/base/parsers/factories/DocTagsFromIElementFactory { - public static final field INSTANCE Lorg/jetbrains/dokka/base/parsers/factories/DocTagsFromIElementFactory; - public final fun getInstance (Lorg/intellij/markdown/IElementType;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Lorg/jetbrains/dokka/links/DRI;Z)Ljava/util/List; - public static synthetic fun getInstance$default (Lorg/jetbrains/dokka/base/parsers/factories/DocTagsFromIElementFactory;Lorg/intellij/markdown/IElementType;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Lorg/jetbrains/dokka/links/DRI;ZILjava/lang/Object;)Ljava/util/List; -} - -public final class org/jetbrains/dokka/base/parsers/factories/DocTagsFromStringFactory { - public static final field INSTANCE Lorg/jetbrains/dokka/base/parsers/factories/DocTagsFromStringFactory; - public final fun getInstance (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Lorg/jetbrains/dokka/links/DRI;)Lorg/jetbrains/dokka/model/doc/DocTag; - public static synthetic fun getInstance$default (Lorg/jetbrains/dokka/base/parsers/factories/DocTagsFromStringFactory;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Lorg/jetbrains/dokka/links/DRI;ILjava/lang/Object;)Lorg/jetbrains/dokka/model/doc/DocTag; -} - -public final class org/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation { - public fun (Ljava/lang/String;Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier;Lorg/jetbrains/dokka/model/doc/DocumentationNode;)V - public final fun component1 ()Ljava/lang/String; - public final fun component2 ()Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier; - public final fun component3 ()Lorg/jetbrains/dokka/model/doc/DocumentationNode; - public final fun copy (Ljava/lang/String;Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier;Lorg/jetbrains/dokka/model/doc/DocumentationNode;)Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation; - public static synthetic fun copy$default (Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation;Ljava/lang/String;Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier;Lorg/jetbrains/dokka/model/doc/DocumentationNode;ILjava/lang/Object;)Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation; - public fun equals (Ljava/lang/Object;)Z - public final fun getClassifier ()Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier; - public final fun getDocumentation ()Lorg/jetbrains/dokka/model/doc/DocumentationNode; - public final fun getName ()Ljava/lang/String; - public fun hashCode ()I - public fun toString ()Ljava/lang/String; -} - -public final class org/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier : java/lang/Enum { - public static final field Module Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier; - public static final field Package Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier; - public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier; - public static fun values ()[Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier; -} - -public final class org/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationFragment { - public fun (Ljava/lang/String;Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier;Ljava/lang/String;Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationSource;)V - public final fun component1 ()Ljava/lang/String; - public final fun component2 ()Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier; - public final fun component3 ()Ljava/lang/String; - public final fun component4 ()Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationSource; - public final fun copy (Ljava/lang/String;Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier;Ljava/lang/String;Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationSource;)Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationFragment; - public static synthetic fun copy$default (Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationFragment;Ljava/lang/String;Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier;Ljava/lang/String;Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationSource;ILjava/lang/Object;)Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationFragment; - public fun equals (Ljava/lang/Object;)Z - public final fun getClassifier ()Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation$Classifier; - public final fun getDocumentation ()Ljava/lang/String; - public final fun getName ()Ljava/lang/String; - public final fun getSource ()Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationSource; - public fun hashCode ()I - public fun toString ()Ljava/lang/String; -} - -public abstract interface class org/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationParsingContext { - public abstract fun markdownParserFor (Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationFragment;Ljava/lang/String;)Lorg/jetbrains/dokka/base/parsers/MarkdownParser; -} - -public final class org/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationParsingContextKt { - public static final fun ModuleAndPackageDocumentationParsingContext (Lorg/jetbrains/dokka/utilities/DokkaLogger;Lorg/jetbrains/dokka/analysis/DokkaResolutionFacade;)Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationParsingContext; - public static synthetic fun ModuleAndPackageDocumentationParsingContext$default (Lorg/jetbrains/dokka/utilities/DokkaLogger;Lorg/jetbrains/dokka/analysis/DokkaResolutionFacade;ILjava/lang/Object;)Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationParsingContext; -} - -public abstract class org/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationSource { - public fun ()V - public abstract fun getDocumentation ()Ljava/lang/String; - public abstract fun getSourceDescription ()Ljava/lang/String; - public fun toString ()Ljava/lang/String; -} - -public final class org/jetbrains/dokka/base/parsers/moduleAndPackage/ParseModuleAndPackageDocumentationFragmentsKt { - public static final fun parseModuleAndPackageDocumentationFragments (Ljava/io/File;)Ljava/util/List; - public static final fun parseModuleAndPackageDocumentationFragments (Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationSource;)Ljava/util/List; -} - -public final class org/jetbrains/dokka/base/parsers/moduleAndPackage/ParseModuleAndPackageDocumentationKt { - public static final fun parseModuleAndPackageDocumentation (Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationParsingContext;Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentationFragment;)Lorg/jetbrains/dokka/base/parsers/moduleAndPackage/ModuleAndPackageDocumentation; -} - public final class org/jetbrains/dokka/base/renderers/ContentTypeCheckingKt { public static final fun getURIExtension (Ljava/lang/String;)Ljava/lang/String; public static final fun isImage (Ljava/lang/String;)Z @@ -391,7 +284,7 @@ public final class org/jetbrains/dokka/base/renderers/html/HtmlRendererKt { } public abstract class org/jetbrains/dokka/base/renderers/html/NavigationDataProvider { - public fun ()V + public fun (Lorg/jetbrains/dokka/plugability/DokkaContext;)V public fun navigableChildren (Lorg/jetbrains/dokka/pages/RootPageNode;)Lorg/jetbrains/dokka/base/renderers/html/NavigationNode; public fun visit (Lorg/jetbrains/dokka/pages/ContentPage;)Lorg/jetbrains/dokka/base/renderers/html/NavigationNode; } @@ -1276,11 +1169,6 @@ public final class org/jetbrains/dokka/base/transformers/documentables/UtilsKt { public static final fun isException (Lorg/jetbrains/dokka/model/properties/WithExtraProperties;)Z } -public final class org/jetbrains/dokka/base/transformers/documentables/utils/FullClassHierarchyBuilder { - public fun ()V - public final fun invoke (Lorg/jetbrains/dokka/model/DModule;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; -} - public final class org/jetbrains/dokka/base/transformers/pages/annotations/SinceKotlinTransformer : org/jetbrains/dokka/transformers/documentation/DocumentableTransformer { public fun (Lorg/jetbrains/dokka/plugability/DokkaContext;)V public final fun getContext ()Lorg/jetbrains/dokka/plugability/DokkaContext; @@ -1332,21 +1220,6 @@ public final class org/jetbrains/dokka/base/transformers/pages/merger/SourceSetM public fun invoke (Lorg/jetbrains/dokka/pages/RootPageNode;)Lorg/jetbrains/dokka/pages/RootPageNode; } -public final class org/jetbrains/dokka/base/transformers/pages/samples/DefaultSamplesTransformer : org/jetbrains/dokka/base/transformers/pages/samples/SamplesTransformer { - public fun (Lorg/jetbrains/dokka/plugability/DokkaContext;)V - public fun processBody (Lcom/intellij/psi/PsiElement;)Ljava/lang/String; - public fun processImports (Lcom/intellij/psi/PsiElement;)Ljava/lang/String; -} - -public abstract class org/jetbrains/dokka/base/transformers/pages/samples/SamplesTransformer : org/jetbrains/dokka/transformers/pages/PageTransformer { - public fun (Lorg/jetbrains/dokka/plugability/DokkaContext;)V - protected fun createSampleBody (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; - public final fun getContext ()Lorg/jetbrains/dokka/plugability/DokkaContext; - public final fun invoke (Lorg/jetbrains/dokka/pages/RootPageNode;)Lorg/jetbrains/dokka/pages/RootPageNode; - public abstract fun processBody (Lcom/intellij/psi/PsiElement;)Ljava/lang/String; - public abstract fun processImports (Lcom/intellij/psi/PsiElement;)Ljava/lang/String; -} - public final class org/jetbrains/dokka/base/transformers/pages/sourcelinks/SourceLink { public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;)V public fun (Lorg/jetbrains/dokka/DokkaConfiguration$SourceLinkDefinition;Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;)V @@ -1389,43 +1262,6 @@ public final class org/jetbrains/dokka/base/transformers/pages/tags/SinceKotlinT public fun isApplicable (Lorg/jetbrains/dokka/model/doc/CustomTagWrapper;)Z } -public final class org/jetbrains/dokka/base/translators/descriptors/DRIWithPlatformInfo { - public fun (Lorg/jetbrains/dokka/links/DRI;Ljava/util/Map;)V - public final fun component1 ()Lorg/jetbrains/dokka/links/DRI; - public final fun component2 ()Ljava/util/Map; - public final fun copy (Lorg/jetbrains/dokka/links/DRI;Ljava/util/Map;)Lorg/jetbrains/dokka/base/translators/descriptors/DRIWithPlatformInfo; - public static synthetic fun copy$default (Lorg/jetbrains/dokka/base/translators/descriptors/DRIWithPlatformInfo;Lorg/jetbrains/dokka/links/DRI;Ljava/util/Map;ILjava/lang/Object;)Lorg/jetbrains/dokka/base/translators/descriptors/DRIWithPlatformInfo; - public fun equals (Ljava/lang/Object;)Z - public final fun getActual ()Ljava/util/Map; - public final fun getDri ()Lorg/jetbrains/dokka/links/DRI; - public fun hashCode ()I - public fun toString ()Ljava/lang/String; -} - -public final class org/jetbrains/dokka/base/translators/descriptors/DefaultDescriptorToDocumentableTranslator : org/jetbrains/dokka/base/translators/descriptors/ExternalClasslikesTranslator, org/jetbrains/dokka/transformers/sources/AsyncSourceToDocumentableTranslator { - public fun (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; - public fun translateClassDescriptor (Lorg/jetbrains/kotlin/descriptors/ClassDescriptor;Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;)Lorg/jetbrains/dokka/model/DClasslike; -} - -public final class org/jetbrains/dokka/base/translators/descriptors/DefaultDescriptorToDocumentableTranslatorKt { - public static final fun withEmptyInfo (Lorg/jetbrains/dokka/links/DRI;)Lorg/jetbrains/dokka/base/translators/descriptors/DRIWithPlatformInfo; -} - -public final class org/jetbrains/dokka/base/translators/descriptors/DefaultExternalDocumentablesProvider : org/jetbrains/dokka/base/translators/descriptors/ExternalDocumentablesProvider { - public fun (Lorg/jetbrains/dokka/plugability/DokkaContext;)V - public fun findClasslike (Lorg/jetbrains/dokka/links/DRI;Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;)Lorg/jetbrains/dokka/model/DClasslike; -} - -public abstract interface class org/jetbrains/dokka/base/translators/descriptors/ExternalClasslikesTranslator { - public abstract fun translateClassDescriptor (Lorg/jetbrains/kotlin/descriptors/ClassDescriptor;Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;)Lorg/jetbrains/dokka/model/DClasslike; -} - -public abstract interface class org/jetbrains/dokka/base/translators/descriptors/ExternalDocumentablesProvider { - public abstract fun findClasslike (Lorg/jetbrains/dokka/links/DRI;Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;)Lorg/jetbrains/dokka/model/DClasslike; -} - public final class org/jetbrains/dokka/base/translators/documentables/BriefFromContentNodesKt { public static final fun firstParagraphBrief (Lorg/jetbrains/dokka/model/doc/DocTag;)Lorg/jetbrains/dokka/model/doc/DocTag; public static final fun firstSentenceBriefFromContentNodes (Ljava/util/List;)Ljava/util/List; @@ -1441,8 +1277,8 @@ public final class org/jetbrains/dokka/base/translators/documentables/DefaultDoc } public class org/jetbrains/dokka/base/translators/documentables/DefaultPageCreator { - public fun (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Lorg/jetbrains/dokka/base/transformers/pages/comments/CommentsToContentConverter;Lorg/jetbrains/dokka/base/signatures/SignatureProvider;Lorg/jetbrains/dokka/utilities/DokkaLogger;Ljava/util/List;)V - public synthetic fun (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Lorg/jetbrains/dokka/base/transformers/pages/comments/CommentsToContentConverter;Lorg/jetbrains/dokka/base/signatures/SignatureProvider;Lorg/jetbrains/dokka/utilities/DokkaLogger;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Lorg/jetbrains/dokka/base/transformers/pages/comments/CommentsToContentConverter;Lorg/jetbrains/dokka/base/signatures/SignatureProvider;Lorg/jetbrains/dokka/utilities/DokkaLogger;Ljava/util/List;Lorg/jetbrains/kotlin/analysis/kotlin/internal/DocumentableSourceLanguageParser;)V + public synthetic fun (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Lorg/jetbrains/dokka/base/transformers/pages/comments/CommentsToContentConverter;Lorg/jetbrains/dokka/base/signatures/SignatureProvider;Lorg/jetbrains/dokka/utilities/DokkaLogger;Ljava/util/List;Lorg/jetbrains/kotlin/analysis/kotlin/internal/DocumentableSourceLanguageParser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V protected fun contentForBrief (Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder$DocumentableContentBuilder;Lorg/jetbrains/dokka/model/Documentable;)V protected fun contentForClasslikesAndEntries (Ljava/util/List;)Lorg/jetbrains/dokka/pages/ContentGroup; protected fun contentForConstructors (Ljava/util/List;Ljava/util/Set;Ljava/util/Set;)Lorg/jetbrains/dokka/pages/ContentGroup; @@ -1462,6 +1298,7 @@ public class org/jetbrains/dokka/base/translators/documentables/DefaultPageCreat public static synthetic fun divergentBlock$default (Lorg/jetbrains/dokka/base/translators/documentables/DefaultPageCreator;Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder$DocumentableContentBuilder;Ljava/lang/String;Ljava/util/Collection;Lorg/jetbrains/dokka/pages/ContentKind;Lorg/jetbrains/dokka/model/properties/PropertyContainer;ILjava/lang/Object;)V protected fun getContentBuilder ()Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder; public final fun getCustomTagContentProviders ()Ljava/util/List; + public final fun getDocumentableAnalyzer ()Lorg/jetbrains/kotlin/analysis/kotlin/internal/DocumentableSourceLanguageParser; public final fun getLogger ()Lorg/jetbrains/dokka/utilities/DokkaLogger; protected final fun getMergeImplicitExpectActualDeclarations ()Z protected final fun getSeparateInheritedMembers ()Z @@ -1622,27 +1459,3 @@ public class org/jetbrains/dokka/base/translators/documentables/PageContentBuild public static synthetic fun row$default (Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder$TableBuilder;Ljava/util/Set;Ljava/util/Set;Lorg/jetbrains/dokka/pages/Kind;Ljava/util/Set;Lorg/jetbrains/dokka/model/properties/PropertyContainer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V } -public final class org/jetbrains/dokka/base/translators/psi/DefaultPsiToDocumentableTranslator : org/jetbrains/dokka/transformers/sources/AsyncSourceToDocumentableTranslator { - public fun (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; -} - -public final class org/jetbrains/dokka/base/translators/psi/DefaultPsiToDocumentableTranslator$DokkaPsiParser { - public fun (Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;Lorg/jetbrains/dokka/analysis/DokkaResolutionFacade;Lorg/jetbrains/dokka/utilities/DokkaLogger;)V - public final fun parsePackage (Ljava/lang/String;Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; -} - -public abstract interface class org/jetbrains/dokka/base/translators/psi/parsers/JavaDocumentationParser { - public abstract fun parseDocumentation (Lcom/intellij/psi/PsiNamedElement;)Lorg/jetbrains/dokka/model/doc/DocumentationNode; -} - -public final class org/jetbrains/dokka/base/translators/psi/parsers/JavadocParser : org/jetbrains/dokka/base/translators/psi/parsers/JavaDocumentationParser { - public static final field Companion Lorg/jetbrains/dokka/base/translators/psi/parsers/JavadocParser$Companion; - public fun (Lorg/jetbrains/dokka/utilities/DokkaLogger;Lorg/jetbrains/dokka/analysis/DokkaResolutionFacade;)V - public fun parseDocumentation (Lcom/intellij/psi/PsiNamedElement;)Lorg/jetbrains/dokka/model/doc/DocumentationNode; -} - -public final class org/jetbrains/dokka/base/translators/psi/parsers/JavadocParser$Companion { -} - diff --git a/plugins/base/base-test-utils/build.gradle.kts b/plugins/base/base-test-utils/build.gradle.kts index 2645fbc3..ef4f9f7b 100644 --- a/plugins/base/base-test-utils/build.gradle.kts +++ b/plugins/base/base-test-utils/build.gradle.kts @@ -7,11 +7,15 @@ plugins { dependencies { compileOnly(projects.core) + compileOnly(projects.plugins.base) + + api(projects.subprojects.analysisKotlinApi) + // TODO [beresnev] analysis switcher + runtimeOnly(project(path = ":subprojects:analysis-kotlin-descriptors", configuration = "shadow")) implementation(kotlin("reflect")) - compileOnly(projects.plugins.base) implementation(projects.core.testApi) implementation(libs.jsoup) diff --git a/plugins/base/base-test-utils/src/main/kotlin/testRunner/baseTestApi.kt b/plugins/base/base-test-utils/src/main/kotlin/testRunner/baseTestApi.kt index a11ddb84..593a487c 100644 --- a/plugins/base/base-test-utils/src/main/kotlin/testRunner/baseTestApi.kt +++ b/plugins/base/base-test-utils/src/main/kotlin/testRunner/baseTestApi.kt @@ -9,7 +9,10 @@ import org.jetbrains.dokka.pages.RootPageNode import org.jetbrains.dokka.plugability.DokkaContext import org.jetbrains.dokka.plugability.DokkaPlugin import org.jetbrains.dokka.testApi.logger.TestLogger -import org.jetbrains.dokka.testApi.testRunner.* +import org.jetbrains.dokka.testApi.testRunner.AbstractTest +import org.jetbrains.dokka.testApi.testRunner.CoreTestMethods +import org.jetbrains.dokka.testApi.testRunner.DokkaTestGenerator +import org.jetbrains.dokka.testApi.testRunner.TestBuilder import org.jetbrains.dokka.utilities.DokkaConsoleLogger import org.jetbrains.dokka.utilities.DokkaLogger import org.jetbrains.dokka.utilities.LoggingLevel diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts index b6ba2917..8bea63e8 100644 --- a/plugins/base/build.gradle.kts +++ b/plugins/base/build.gradle.kts @@ -8,14 +8,16 @@ plugins { dependencies { compileOnly(projects.core) + compileOnly(projects.subprojects.analysisKotlinApi) - implementation(kotlin("reflect")) + implementation(projects.subprojects.analysisMarkdownJb) + // Other + implementation(kotlin("reflect")) implementation(libs.kotlinx.coroutines.core) - - compileOnly(projects.kotlinAnalysis) implementation(libs.jsoup) - + implementation(libs.freemarker) + implementation(libs.kotlinx.html) implementation(libs.jackson.kotlin) constraints { implementation(libs.jackson.databind) { @@ -23,14 +25,9 @@ dependencies { } } - implementation(libs.freemarker) - + // Test only testImplementation(projects.plugins.base.baseTestUtils) testImplementation(projects.core.contentMatcherTestUtils) - - implementation(libs.kotlinx.html) - - testImplementation(projects.kotlinAnalysis) testImplementation(projects.core.testApi) testImplementation(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter) diff --git a/plugins/base/frontend/src/main/components/search/dokkaFuzzyFilter.tsx b/plugins/base/frontend/src/main/components/search/dokkaFuzzyFilter.tsx index 1d0c8c10..d5150dd5 100644 --- a/plugins/base/frontend/src/main/components/search/dokkaFuzzyFilter.tsx +++ b/plugins/base/frontend/src/main/components/search/dokkaFuzzyFilter.tsx @@ -2,7 +2,7 @@ import Select from '@jetbrains/ring-ui/components/select/select'; import {Option, OptionWithHighlightComponent, OptionWithSearchResult} from "./types"; import fuzzyHighlight from '@jetbrains/ring-ui/components/global/fuzzy-highlight.js' import React from "react"; -import {SearchResultRow, signatureFromSearchResult} from "./searchResultRow"; +import {SearchResultRow} from "./searchResultRow"; import _ from "lodash"; const orderRecords = (records: OptionWithSearchResult[], searchPhrase: string): OptionWithSearchResult[] => { @@ -94,4 +94,4 @@ export class DokkaFuzzyFilterComponent extends Select { return highlightMatchedPhrases(orderRecords(matchedRecords, filterPhrase)) } -} \ No newline at end of file +} diff --git a/plugins/base/frontend/src/main/components/search/search.tsx b/plugins/base/frontend/src/main/components/search/search.tsx index d4e406bf..045f6365 100644 --- a/plugins/base/frontend/src/main/components/search/search.tsx +++ b/plugins/base/frontend/src/main/components/search/search.tsx @@ -1,12 +1,12 @@ -import React, { useCallback, useEffect, useState } from 'react'; +import React, {useCallback, useEffect, useState} from 'react'; import List from '@jetbrains/ring-ui/components/list/list'; import Select from '@jetbrains/ring-ui/components/select/select'; import '@jetbrains/ring-ui/components/input-size/input-size.css'; import './search.scss'; import {CustomAnchorProps, IWindow, Option, Props} from "./types"; -import { DokkaSearchAnchor } from "./dokkaSearchAnchor"; -import { DokkaFuzzyFilterComponent } from "./dokkaFuzzyFilter"; -import { relativizeUrlForRequest } from '../utils/requests'; +import {DokkaSearchAnchor} from "./dokkaSearchAnchor"; +import {DokkaFuzzyFilterComponent} from "./dokkaFuzzyFilter"; +import {relativizeUrlForRequest} from '../utils/requests'; const WithFuzzySearchFilterComponent: React.FC = ({ data }: Props) => { const [selected, onSelected] = useState