From 04fe911b6868ee26ff2b7ac1216f815224801634 Mon Sep 17 00:00:00 2001 From: Alex Plate Date: Wed, 18 Dec 2019 19:05:00 +0300 Subject: [PATCH] Workspace Model: Do not clear `librariesToAdd` after the model commit GitOrigin-RevId: b74425097ceb90ad003cc573864cf2f4f95fe5e3 --- .../legacyBridge/intellij/LegacyBridgeModifiableRootModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/workspaceModel-ide/src/com/intellij/workspace/legacyBridge/intellij/LegacyBridgeModifiableRootModel.kt b/platform/workspaceModel-ide/src/com/intellij/workspace/legacyBridge/intellij/LegacyBridgeModifiableRootModel.kt index 8e0491ec6580..e3c531711418 100644 --- a/platform/workspaceModel-ide/src/com/intellij/workspace/legacyBridge/intellij/LegacyBridgeModifiableRootModel.kt +++ b/platform/workspaceModel-ide/src/com/intellij/workspace/legacyBridge/intellij/LegacyBridgeModifiableRootModel.kt @@ -313,8 +313,7 @@ class LegacyBridgeModifiableRootModel( LegacyBridgeModuleRootComponent.getInstance(module).newModuleLibraries.clear() LegacyBridgeModuleRootComponent.getInstance(module).newModuleLibraries.addAll(moduleLibraryTable.librariesToAdd) - moduleLibraryTable.librariesToAdd.clear() - moduleLibraryTable.librariesToRemove.clear() + // Do not clear `librariesToAdd`. Otherwise `getLibraries()` will return an empty list after the commit dispose() @@ -577,6 +576,7 @@ class LegacyBridgeModifiableRootModel( } override fun removeLibrary(library: Library) { + modifiableModel.assertModelIsLive() library as LegacyBridgeLibrary val moduleLibraryTableId = library.libraryId.tableId as LibraryTableId.ModuleLibraryTableId