Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Analysis API to 2.1.20-dev-4370 #3802

Merged
merged 15 commits into from
Nov 26, 2024
Merged

Update Analysis API to 2.1.20-dev-4370 #3802

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1297659
Mute test
vmishenev Sep 16, 2024
3a3ffbd
Dispose Global Standalone Application Services
vmishenev Oct 4, 2024
43bee3c
Trigger
vmishenev Oct 31, 2024
62d243f
Double metaspace
vmishenev Nov 19, 2024
b1fc404
Update the AA to the latest
vmishenev Nov 19, 2024
70a4bcc
Decrease metaspace
vmishenev Nov 19, 2024
e0f78b4
Add KDoc and a condition for disposing of AA
vmishenev Nov 19, 2024
977340a
Merge branch 'master' of https://github.com/Kotlin/dokka into vmishen…
vmishenev Nov 19, 2024
fa90692
Fix tests
vmishenev Nov 19, 2024
9e26139
Add the flag `SoftRefLRUPolicyMSPerMB`
vmishenev Nov 19, 2024
9d707c2
Unmute test
vmishenev Nov 20, 2024
a58d9b2
Merge branch 'master' of https://github.com/Kotlin/dokka into vmishen…
vmishenev Nov 20, 2024
09f60db
Add TODO
vmishenev Nov 20, 2024
4fa533f
Edit KDoc of `finalizeCoroutines`
vmishenev Nov 21, 2024
54038cf
Add link to #3936
vmishenev Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../src/testTemplateProjectTasksExecutionStress/kotlin/SequentialTasksExecutionStressTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class SequentialTasksExecutionStressTest : AbstractGradleIntegrationTest() {
buildVersions,
"runTasks",
"-Ptask_number=$iterations",
jvmArgs = listOf("-Xmx1G", "-XX:MaxMetaspaceSize=500m"),
jvmArgs = listOf("-Xmx1G", "-XX:MaxMetaspaceSize=2g"),
enableBuildCache = false,
).buildRelaxed()

Expand Down
6 changes: 6 additions & 0 deletions ...analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/JavaAnalysisPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ public class JavaAnalysisPlugin : DokkaPlugin() {
DocCommentFinder(logger, docCommentFactory)
}

@InternalDokkaApi
public fun disposeGlobalStandaloneApplicationServices() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we add this function inside analysis-java-psi module and not call directly inside K2 analysis?

Copy link
Contributor Author

@vmishenev vmishenev Nov 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only from analysis-java-psi, you can call the methods of the IJ Platform. The K2 module has the truncated version of IJ from the compiler dependencies.
On the other hand, the calling of disposeGlobalStandaloneApplicationServices might affect the PSI analysis somehow.

Copy link
Contributor Author

@vmishenev vmishenev Nov 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Anyway, Marco will merge the endpoint into AA so we will be able to call it from K2. I left TODO

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably it will be nice to also create an issue on our side, to keep track of it

@Suppress("UnstableApiUsage")
com.intellij.util.concurrency.AppExecutorUtil.shutdownApplicationScheduledExecutorService()
}

internal val javaDocCommentCreator by extending {
docCommentCreators providing { JavaDocCommentCreator() }
}
Expand Down
5 changes: 4 additions & 1 deletion ...c/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/SymbolsAnalysisPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions dokka-subprojects/plugin-base/src/test/kotlin/model/ClassesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
}

@Test
@OnlyDescriptors("#3787")
vmishenev marked this conversation as resolved.
Show resolved Hide resolved
fun nestedGenericClasses() {
inlineModelTest(
"""
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
whyoleg marked this conversation as resolved.
Show resolved Hide resolved

# 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
Expand Down
Loading