From 8ea1cd20193b4c19b6d9d0b1b0630a6afa2c503d Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Fri, 20 Dec 2024 20:31:41 +0100 Subject: [PATCH] Revert "[kotlin] Put `configureLibraryJar()` in `KotlinWithLibraryConfigurator` under WA for `configureModuleWithLibrary()`" This reverts commit a26bfde0489c2d5e28e33bfe9fcd89c402a2061e. GitOrigin-RevId: b08e0a2202ed71088d389bfdf13c9d8b2f8c276c --- .../configuration/KotlinWithLibraryConfigurator.kt | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt b/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt index 22f950261107..1b637b03ba7a 100644 --- a/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt +++ b/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt @@ -219,12 +219,10 @@ abstract class KotlinWithLibraryConfigurator

> protected ?: error("Kotlin Library has to be created in advance")) as LibraryEx library.modifiableModel.let { libraryModel -> - // will be performed later on EDT - writeActions.addOrExecute { runWriteAction { - configureLibraryJar(project, libraryModel, libraryJarDescriptor, collector, ProgressManager.getGlobalProgressIndicator()) - libraryModel.commit() - } - } + configureLibraryJar(project, libraryModel, libraryJarDescriptor, collector, ProgressManager.getGlobalProgressIndicator()) + + // commit will be performed later on EDT + writeActions.addOrExecute { runWriteAction { libraryModel.commit() } } } addLibraryToModuleIfNeeded(module, library, collector, writeActions) @@ -239,10 +237,6 @@ abstract class KotlinWithLibraryConfigurator

> protected } } - /** - * Updates KotlinJavaRuntime.xml - * Should be performed under a write action. - */ fun configureLibraryJar( project: Project, library: LibraryEx.ModifiableModelEx,