From 12976594053c70c4265f942336102791f51d8dcb Mon Sep 17 00:00:00 2001 From: "Vadim.Mishenev" Date: Mon, 16 Sep 2024 15:15:59 +0300 Subject: [PATCH 01/13] Mute test --- .../plugin-base/src/test/kotlin/model/ClassesTest.kt | 1 + gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dokka-subprojects/plugin-base/src/test/kotlin/model/ClassesTest.kt b/dokka-subprojects/plugin-base/src/test/kotlin/model/ClassesTest.kt index e5658524b2..48a17e8390 100644 --- a/dokka-subprojects/plugin-base/src/test/kotlin/model/ClassesTest.kt +++ b/dokka-subprojects/plugin-base/src/test/kotlin/model/ClassesTest.kt @@ -472,6 +472,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class } @Test + @OnlyDescriptors("#3787") fun nestedGenericClasses() { inlineModelTest( """ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 27fcc53cfb..0aff21f97e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ ktor = "2.3.11" ## Analysis kotlin-compiler = "2.0.20" -kotlin-compiler-k2 = "2.1.0-dev-5441" +kotlin-compiler-k2 = "2.1.0-dev-7103" # MUST match the version of the intellij platform used in the kotlin compiler, # otherwise this will lead to different versions of psi API and implementations From 3a3ffbdf6a9b9bcf32f3283e2673a1d3865207a6 Mon Sep 17 00:00:00 2001 From: "Vadim.Mishenev" Date: Fri, 4 Oct 2024 12:11:20 +0300 Subject: [PATCH 02/13] Dispose Global Standalone Application Services --- .../org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt | 6 ++++++ .../analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt b/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt index 8a322a7466..dcab2d92a1 100644 --- a/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt +++ b/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt @@ -71,6 +71,12 @@ public class JavaAnalysisPlugin : DokkaPlugin() { DocCommentFinder(logger, docCommentFactory) } + @InternalDokkaApi + public fun disposeGlobalStandaloneApplicationServices() { + @Suppress("UnstableApiUsage") + com.intellij.util.concurrency.AppExecutorUtil.shutdownApplicationScheduledExecutorService() + } + internal val javaDocCommentCreator by extending { docCommentCreators providing { JavaDocCommentCreator() } } diff --git a/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt b/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt index 5c5cf233f2..441ece84af 100644 --- a/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt +++ b/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt @@ -42,7 +42,10 @@ public class SymbolsAnalysisPlugin : DokkaPlugin() { } internal val disposeKotlinAnalysisPostAction by extending { - CoreExtensions.postActions with PostAction { querySingle { kotlinAnalysis }.close() } + CoreExtensions.postActions with PostAction { + querySingle { kotlinAnalysis }.close() + javaAnalysisPlugin.disposeGlobalStandaloneApplicationServices() + } } internal val symbolToDocumentableTranslator by extending { From 43bee3ce1ab1be2d059a855806315c0e4f986566 Mon Sep 17 00:00:00 2001 From: "Vadim.Mishenev" Date: Thu, 31 Oct 2024 12:05:34 +0200 Subject: [PATCH 03/13] Trigger --- .../kotlin/SequentialTasksExecutionStressTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt b/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt index 162e99fbe6..1566954364 100644 --- a/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt +++ b/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt @@ -25,7 +25,7 @@ class SequentialTasksExecutionStressTest : AbstractGradleIntegrationTest() { buildVersions, "runTasks", "-Ptask_number=$iterations", - jvmArgs = listOf("-Xmx1G", "-XX:MaxMetaspaceSize=500m"), + jvmArgs = listOf("-Xmx1G", "-XX:MaxMetaspaceSize=1000m"), enableBuildCache = false, ).buildRelaxed() From 62d243f78cef45f2dc3543e42af90f36561c6e7f Mon Sep 17 00:00:00 2001 From: vmishenev Date: Tue, 19 Nov 2024 09:44:01 +0200 Subject: [PATCH 04/13] Double metaspace --- .../kotlin/SequentialTasksExecutionStressTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt b/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt index 1566954364..9bfc992cdb 100644 --- a/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt +++ b/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt @@ -25,7 +25,7 @@ class SequentialTasksExecutionStressTest : AbstractGradleIntegrationTest() { buildVersions, "runTasks", "-Ptask_number=$iterations", - jvmArgs = listOf("-Xmx1G", "-XX:MaxMetaspaceSize=1000m"), + jvmArgs = listOf("-Xmx1G", "-XX:MaxMetaspaceSize=2g"), enableBuildCache = false, ).buildRelaxed() From b1fc404b7c7c362aca59630994644a1208e4c3c2 Mon Sep 17 00:00:00 2001 From: vmishenev Date: Tue, 19 Nov 2024 12:03:32 +0200 Subject: [PATCH 05/13] Update the AA to the latest --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0aff21f97e..145469505d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ ktor = "2.3.11" ## Analysis kotlin-compiler = "2.0.20" -kotlin-compiler-k2 = "2.1.0-dev-7103" +kotlin-compiler-k2 = "2.1.20-dev-4370" # MUST match the version of the intellij platform used in the kotlin compiler, # otherwise this will lead to different versions of psi API and implementations From 70a4bccaa2da6a3c74d59b940a5ac5cbed0367a0 Mon Sep 17 00:00:00 2001 From: vmishenev Date: Tue, 19 Nov 2024 12:44:30 +0200 Subject: [PATCH 06/13] Decrease metaspace --- .../kotlin/SequentialTasksExecutionStressTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt b/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt index 9bfc992cdb..1566954364 100644 --- a/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt +++ b/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt @@ -25,7 +25,7 @@ class SequentialTasksExecutionStressTest : AbstractGradleIntegrationTest() { buildVersions, "runTasks", "-Ptask_number=$iterations", - jvmArgs = listOf("-Xmx1G", "-XX:MaxMetaspaceSize=2g"), + jvmArgs = listOf("-Xmx1G", "-XX:MaxMetaspaceSize=1000m"), enableBuildCache = false, ).buildRelaxed() From e0f78b46db1f8198d41fd402031dc0379350a04c Mon Sep 17 00:00:00 2001 From: vmishenev Date: Tue, 19 Nov 2024 14:10:22 +0200 Subject: [PATCH 07/13] Add KDoc and a condition for disposing of AA --- .../analysis-java-psi/api/analysis-java-psi.api | 1 + .../dokka/analysis/java/JavaAnalysisPlugin.kt | 8 ++++++++ .../kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt | 14 +++++++------- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dokka-subprojects/analysis-java-psi/api/analysis-java-psi.api b/dokka-subprojects/analysis-java-psi/api/analysis-java-psi.api index 02d6628479..5cb0cc30e1 100644 --- a/dokka-subprojects/analysis-java-psi/api/analysis-java-psi.api +++ b/dokka-subprojects/analysis-java-psi/api/analysis-java-psi.api @@ -26,6 +26,7 @@ public final class org/jetbrains/dokka/analysis/java/ExceptionJavadocTag$Compani public final class org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin : org/jetbrains/dokka/plugability/DokkaPlugin { public fun ()V + public final fun disposeGlobalStandaloneApplicationServices ()V public final fun getDocCommentCreators ()Lorg/jetbrains/dokka/plugability/ExtensionPoint; public final fun getDocCommentFinder ()Lorg/jetbrains/dokka/analysis/java/doccomment/DocCommentFinder; public final fun getDocCommentParsers ()Lorg/jetbrains/dokka/plugability/ExtensionPoint; diff --git a/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt b/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt index dcab2d92a1..6b7d912854 100644 --- a/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt +++ b/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt @@ -71,6 +71,14 @@ public class JavaAnalysisPlugin : DokkaPlugin() { DocCommentFinder(logger, docCommentFactory) } + /** + * Disposes global resources which would persist after unloading Analysis API (Symbols analysis) and IJ platform classes. + * + * **Important:** Once this function has been called, Analysis API *and* IntelliJ platform classes should not be used anymore. The classes + * should either be unloaded or the whole program should be shut down. + * + * Note: Disposing of resources, including threads, allows unloading Dokka's class loader. + */ @InternalDokkaApi public fun disposeGlobalStandaloneApplicationServices() { @Suppress("UnstableApiUsage") diff --git a/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt b/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt index 441ece84af..9f43ad94ef 100644 --- a/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt +++ b/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt @@ -20,10 +20,7 @@ import org.jetbrains.dokka.analysis.kotlin.symbols.services.* import org.jetbrains.dokka.analysis.kotlin.symbols.services.KotlinDocumentableSourceLanguageParser import org.jetbrains.dokka.analysis.kotlin.symbols.services.SymbolExternalDocumentablesProvider import org.jetbrains.dokka.analysis.kotlin.symbols.translators.DefaultSymbolToDocumentableTranslator -import org.jetbrains.dokka.plugability.DokkaPlugin -import org.jetbrains.dokka.plugability.DokkaPluginApiPreview -import org.jetbrains.dokka.plugability.PluginApiPreviewAcknowledgement -import org.jetbrains.dokka.plugability.querySingle +import org.jetbrains.dokka.plugability.* import org.jetbrains.dokka.renderers.PostAction import org.jetbrains.kotlin.asJava.elements.KtLightAbstractAnnotation @@ -42,9 +39,12 @@ public class SymbolsAnalysisPlugin : DokkaPlugin() { } internal val disposeKotlinAnalysisPostAction by extending { - CoreExtensions.postActions with PostAction { - querySingle { kotlinAnalysis }.close() - javaAnalysisPlugin.disposeGlobalStandaloneApplicationServices() + CoreExtensions.postActions providing { context -> + PostAction { + querySingle { kotlinAnalysis }.close() + if (context.configuration.finalizeCoroutines) + javaAnalysisPlugin.disposeGlobalStandaloneApplicationServices() + } } } From fa90692bb0746f6e2db779d81567114e5c940290 Mon Sep 17 00:00:00 2001 From: vmishenev Date: Tue, 19 Nov 2024 14:46:42 +0200 Subject: [PATCH 08/13] Fix tests --- .../test/api/configuration/TestDokkaConfigurationMapper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dokka-subprojects/analysis-kotlin-api/src/testFixtures/kotlin/org/jetbrains/dokka/analysis/test/api/configuration/TestDokkaConfigurationMapper.kt b/dokka-subprojects/analysis-kotlin-api/src/testFixtures/kotlin/org/jetbrains/dokka/analysis/test/api/configuration/TestDokkaConfigurationMapper.kt index 35c084e3a6..04bb6a6180 100644 --- a/dokka-subprojects/analysis-kotlin-api/src/testFixtures/kotlin/org/jetbrains/dokka/analysis/test/api/configuration/TestDokkaConfigurationMapper.kt +++ b/dokka-subprojects/analysis-kotlin-api/src/testFixtures/kotlin/org/jetbrains/dokka/analysis/test/api/configuration/TestDokkaConfigurationMapper.kt @@ -82,7 +82,7 @@ fun TestDokkaConfiguration.toDokkaConfiguration(projectDir: File): DokkaConfigur override val suppressInheritedMembers: Boolean get() = throw NotImplementedError("Not expected to be used by analysis modules") override val finalizeCoroutines: Boolean - get() = throw NotImplementedError("Not expected to be used by analysis modules") + get() = false } } From 9e26139dee3dc629abb545aa60ff1be6a9f3c91f Mon Sep 17 00:00:00 2001 From: vmishenev Date: Tue, 19 Nov 2024 15:09:11 +0200 Subject: [PATCH 09/13] Add the flag `SoftRefLRUPolicyMSPerMB` --- .../kotlin/SequentialTasksExecutionStressTest.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt b/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt index 1566954364..a2d4aec71a 100644 --- a/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt +++ b/dokka-integration-tests/gradle/src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt @@ -25,7 +25,10 @@ class SequentialTasksExecutionStressTest : AbstractGradleIntegrationTest() { buildVersions, "runTasks", "-Ptask_number=$iterations", - jvmArgs = listOf("-Xmx1G", "-XX:MaxMetaspaceSize=1000m"), + jvmArgs = listOf( + "-Xmx1G", "-XX:MaxMetaspaceSize=500m", + "-XX:SoftRefLRUPolicyMSPerMB=10" // to free up the metaspace on JVM 8, see https://youtrack.jetbrains.com/issue/KT-55831/ + ), enableBuildCache = false, ).buildRelaxed() From 9d707c2426867246fb17e5ffa017730e5712dcfb Mon Sep 17 00:00:00 2001 From: vmishenev Date: Wed, 20 Nov 2024 17:11:59 +0200 Subject: [PATCH 10/13] Unmute test --- .../plugin-base/src/test/kotlin/model/ClassesTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/dokka-subprojects/plugin-base/src/test/kotlin/model/ClassesTest.kt b/dokka-subprojects/plugin-base/src/test/kotlin/model/ClassesTest.kt index 48a17e8390..e5658524b2 100644 --- a/dokka-subprojects/plugin-base/src/test/kotlin/model/ClassesTest.kt +++ b/dokka-subprojects/plugin-base/src/test/kotlin/model/ClassesTest.kt @@ -472,7 +472,6 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class } @Test - @OnlyDescriptors("#3787") fun nestedGenericClasses() { inlineModelTest( """ From 09f60db4ec6360b3736eb4cd1c60b5aa14a99768 Mon Sep 17 00:00:00 2001 From: vmishenev Date: Wed, 20 Nov 2024 17:19:13 +0200 Subject: [PATCH 11/13] Add TODO --- .../org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt | 1 + .../analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt b/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt index 6b7d912854..2d1f925616 100644 --- a/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt +++ b/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt @@ -71,6 +71,7 @@ public class JavaAnalysisPlugin : DokkaPlugin() { DocCommentFinder(logger, docCommentFactory) } + // TODO https://youtrack.jetbrains.com/issue/KT-71862 use an endpoint from AA /** * Disposes global resources which would persist after unloading Analysis API (Symbols analysis) and IJ platform classes. * diff --git a/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt b/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt index 9f43ad94ef..1e77797375 100644 --- a/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt +++ b/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt @@ -43,6 +43,7 @@ public class SymbolsAnalysisPlugin : DokkaPlugin() { PostAction { querySingle { kotlinAnalysis }.close() if (context.configuration.finalizeCoroutines) + // TODO https://youtrack.jetbrains.com/issue/KT-71862 use an endpoint from AA javaAnalysisPlugin.disposeGlobalStandaloneApplicationServices() } } From 4fa533f975bc91e91818877f085c85ec46cc76a5 Mon Sep 17 00:00:00 2001 From: vmishenev Date: Thu, 21 Nov 2024 12:54:13 +0200 Subject: [PATCH 12/13] Edit KDoc of `finalizeCoroutines` --- .../main/kotlin/org/jetbrains/dokka/configuration.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dokka-subprojects/core/src/main/kotlin/org/jetbrains/dokka/configuration.kt b/dokka-subprojects/core/src/main/kotlin/org/jetbrains/dokka/configuration.kt index d510e47a8b..f5a18adf0e 100644 --- a/dokka-subprojects/core/src/main/kotlin/org/jetbrains/dokka/configuration.kt +++ b/dokka-subprojects/core/src/main/kotlin/org/jetbrains/dokka/configuration.kt @@ -147,17 +147,22 @@ public interface DokkaConfiguration : Serializable { /** * Whether coroutines dispatchers should be shutdown after * generating documentation via [DokkaGenerator.generate]. + * Additionally, whether the Analysis API and IJ platform global + * services should be shutdown. * - * It effectively stops all background threads associated with + * If this is enabled, Coroutines *and* the Analysis API *and* IntelliJ + * platform classes should no longer be used after the documentation is generated once. + * + * For example, it effectively stops all background threads associated with * coroutines in order to make classes unloadable by the JVM, * and rejects all new tasks with [RejectedExecutionException] * - * This is primarily useful for multi-module builds where coroutines + * This is primarily useful for multi-module builds where global services * can be shut down after each module's partial task to avoid * possible memory leaks. * * However, this can lead to problems in specific lifecycles where - * coroutines are shared and will be reused after documentation generation, + * global services are shared and will be reused after documentation generation, * and closing it down will leave the build in an inoperable state. * One such example is unit tests, for which finalization should be disabled. */ From 54038cf1a5db7068b704d5adbccef798a0858ccf Mon Sep 17 00:00:00 2001 From: vmishenev Date: Mon, 25 Nov 2024 18:59:19 +0200 Subject: [PATCH 13/13] Add link to #3936 --- .../org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt | 2 +- .../analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt b/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt index 2d1f925616..d4d3dc582a 100644 --- a/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt +++ b/dokka-subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt @@ -71,7 +71,7 @@ public class JavaAnalysisPlugin : DokkaPlugin() { DocCommentFinder(logger, docCommentFactory) } - // TODO https://youtrack.jetbrains.com/issue/KT-71862 use an endpoint from AA + // TODO #3936(https://youtrack.jetbrains.com/issue/KT-71862) use an endpoint from AA /** * Disposes global resources which would persist after unloading Analysis API (Symbols analysis) and IJ platform classes. * diff --git a/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt b/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt index 1e77797375..f12ff3f033 100644 --- a/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt +++ b/dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt @@ -43,7 +43,7 @@ public class SymbolsAnalysisPlugin : DokkaPlugin() { PostAction { querySingle { kotlinAnalysis }.close() if (context.configuration.finalizeCoroutines) - // TODO https://youtrack.jetbrains.com/issue/KT-71862 use an endpoint from AA + // TODO #3936(https://youtrack.jetbrains.com/issue/KT-71862) use an endpoint from AA javaAnalysisPlugin.disposeGlobalStandaloneApplicationServices() } }