Skip to content

Commit 684c5a5

Browse files
committed
Add com.jetbrains.intellij.platform:util-base to the compile-only dependencies of analysis-kotlin-symbols to gain access to the LoadingState
1 parent 4e69aaf commit 684c5a5

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

dokka-subprojects/analysis-kotlin-symbols/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5-
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
65
import dokkabuild.overridePublicationArtifactId
76

87
plugins {
@@ -61,6 +60,9 @@ dependencies {
6160

6261
// TODO [beresnev] get rid of it
6362
compileOnly(libs.kotlinx.coroutines.core)
63+
64+
// to gain access to com.intellij.diagnostic.LoadingState in the compile time
65+
compileOnly(libs.intellij.util.base)
6466
}
6567

6668
tasks.shadowJar {

dokka-subprojects/analysis-kotlin-symbols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/KotlinAnalysis.kt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
package org.jetbrains.dokka.analysis.kotlin.symbols.plugin
66

7+
import com.intellij.diagnostic.LoadingState
78
import com.intellij.openapi.Disposable
89
import com.intellij.openapi.util.Disposer
910
import org.jetbrains.dokka.DokkaConfiguration
@@ -249,13 +250,7 @@ private fun Path.hasSuitableExtensionToAnalyse(): Boolean {
249250

250251
private fun enableExperimentalKDocResolution() {
251252
// Enable experimental KDoc resolution in Kotlin Analysis API (K2)
252-
runCatching {
253-
Class.forName("com.intellij.diagnostic.LoadingState").let { klass ->
254-
klass.getMethod("setCurrentState", klass).invoke(
255-
null,
256-
klass.getMethod("valueOf", String::class.java).invoke(null, "COMPONENTS_LOADED")
257-
)
258-
}
259-
}
253+
@Suppress("UnstableApiUsage")
254+
LoadingState.setCurrentState(LoadingState.COMPONENTS_LOADED)
260255
System.setProperty("kotlin.analysis.experimentalKDocResolution", "true")
261256
}

gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ kotlin-symbol-light-classes = { module = "org.jetbrains.kotlin:symbol-light-clas
122122
intellij-java-psi-api = { module = "com.jetbrains.intellij.java:java-psi", version.ref = "intellij-platform" }
123123
intellij-java-psi-impl = { module = "com.jetbrains.intellij.java:java-psi-impl", version.ref = "intellij-platform" }
124124
intellij-util= { module = "com.jetbrains.intellij.platform:util", version.ref = "intellij-platform" }
125+
intellij-util-base= { module = "com.jetbrains.intellij.platform:util-base", version.ref = "intellij-platform" }
125126

126127
#### HTML ####
127128
jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }

0 commit comments

Comments
 (0)