MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[kotlin] Put configureLibraryJar() in KotlinWithLibraryConfigurator under WA for configureModuleWithLibrary()"

Browse Source 
This reverts commit a26bfde0489c2d5e28e33bfe9fcd89c402a2061e.


(cherry picked from commit b08e0a2202ed71088d389bfdf13c9d8b2f8c276c)

IJ-CR-152120

GitOrigin-RevId: fbd624ce203a8a601f33e20ee0d37fa95ce3ff0f
This commit is contained in:
Dmitry Batkovich
2024-12-20 20:31:41 +01:00
committed by intellij-monorepo-bot
parent e2faf5facc
commit a992979edb
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt
View File

@@ -217,12 +217,10 @@ abstract class KotlinWithLibraryConfigurator<P : LibraryProperties<*>> 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)
@@ -237,10 +235,6 @@ abstract class KotlinWithLibraryConfigurator<P : LibraryProperties<*>> protected
}
}
/**
* Updates KotlinJavaRuntime.xml
* Should be performed under a write action.
*/
fun configureLibraryJar(
project: Project,
library: LibraryEx.ModifiableModelEx,