MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
KTIJ-31449

GitOrigin-RevId: a26bfde0489c2d5e28e33bfe9fcd89c402a2061e
This commit is contained in:
Victoria.Petrakovich
2024-09-30 15:16:14 +02:00
committed by intellij-monorepo-bot
parent af027acdf3
commit 89c5ef7b75
1 changed files with 10 additions and 4 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,10 +217,12 @@ abstract class KotlinWithLibraryConfigurator<P : LibraryProperties<*>> protected
?: error("Kotlin Library has to be created in advance")) as LibraryEx
library.modifiableModel.let { libraryModel ->
configureLibraryJar(project, libraryModel, libraryJarDescriptor, collector, ProgressManager.getGlobalProgressIndicator())
// commit will be performed later on EDT
writeActions.addOrExecute { runWriteAction { libraryModel.commit() } }
// will be performed later on EDT
writeActions.addOrExecute { runWriteAction {
configureLibraryJar(project, libraryModel, libraryJarDescriptor, collector, ProgressManager.getGlobalProgressIndicator())
libraryModel.commit()
}
}
}
addLibraryToModuleIfNeeded(module, library, collector, writeActions)
@@ -235,6 +237,10 @@ abstract class KotlinWithLibraryConfigurator<P : LibraryProperties<*>> protected
}
}
/**
* Updates KotlinJavaRuntime.xml
* Should be performed under a write action.
*/
fun configureLibraryJar(
project: Project,
library: LibraryEx.ModifiableModelEx,