From 26628a5efd311dda6fa05a2fe701386b939d0f54 Mon Sep 17 00:00:00 2001
From: Mikhail Mazurkevich <mikhail.mazurkevich@jetbrains.com>
Date: Wed, 18 Dec 2019 12:30:40 +0300
Subject: [PATCH] Revert "[workspace model] Remove module library if module was
 deleted"

This reverts commit 904f1006

GitOrigin-RevId: 72a4c79c52846546cd2553832d98c8c01c09f92b
---
 .../workspace/jps/LegacyBridgeModulesTest.kt  | 30 -------------------
 .../LegacyBridgeModuleManagerComponent.kt     | 16 ----------
 2 files changed, 46 deletions(-)

diff --git a/platform/workspaceModel-ide-tests/testSrc/com/intellij/workspace/jps/LegacyBridgeModulesTest.kt b/platform/workspaceModel-ide-tests/testSrc/com/intellij/workspace/jps/LegacyBridgeModulesTest.kt
index 3e3e61217e4a..0b4b7059c10c 100644
--- a/platform/workspaceModel-ide-tests/testSrc/com/intellij/workspace/jps/LegacyBridgeModulesTest.kt
+++ b/platform/workspaceModel-ide-tests/testSrc/com/intellij/workspace/jps/LegacyBridgeModulesTest.kt
@@ -614,36 +614,6 @@ class LegacyBridgeModulesTest {
     assertTrue(mavenModuleEntity.dependencies[0] is ModuleDependencyItem.ModuleSourceDependency)
   }
 
-  @Test
-  fun `test module with library remove`() = WriteCommandAction.runWriteCommandAction(project) {
-    val moduleName = "build"
-    val antLibraryName = "ant-lib"
-
-    val iprFile = File(project.projectFilePath!!)
-    val moduleFile = File(project.basePath, "$moduleName.iml")
-    val module = ModuleManager.getInstance(project).modifiableModel.let { moduleModel ->
-      val module = moduleModel.newModule(moduleFile.path, EmptyModuleType.getInstance().id, null) as LegacyBridgeModule
-      moduleModel.commit()
-      module
-    }
-    ModuleRootModificationUtil.addModuleLibrary(module, antLibraryName,
-                                                listOf(File(project.basePath, "$antLibraryName.jar").path),
-                                                emptyList())
-    StoreUtil.saveDocumentsAndProjectSettings(project)
-    assertTrue(iprFile.readText().contains(moduleName))
-    assertTrue(moduleFile.readText().contains(antLibraryName))
-
-    ModuleManager.getInstance(project).disposeModule(module)
-    StoreUtil.saveDocumentsAndProjectSettings(project)
-    assertFalse(iprFile.readText().contains(moduleName))
-    assertTrue(moduleFile.exists())
-
-    assertNull(ModuleManager.getInstance(project).findModuleByName(antLibraryName))
-    val entityStorage = WorkspaceModel.getInstance(project).entityStore.current
-    assertEmpty(entityStorage.entities(ModuleEntity::class.java).toList())
-    assertEmpty(entityStorage.entities(LibraryEntity::class.java).toList())
-  }
-
   @Test
   fun `test remove module removes source roots`() = WriteCommandAction.runWriteCommandAction(project) {
     val moduleName = "build"
diff --git a/platform/workspaceModel-ide/src/com/intellij/workspace/legacyBridge/intellij/LegacyBridgeModuleManagerComponent.kt b/platform/workspaceModel-ide/src/com/intellij/workspace/legacyBridge/intellij/LegacyBridgeModuleManagerComponent.kt
index 516081d88e44..82faed99cee0 100644
--- a/platform/workspaceModel-ide/src/com/intellij/workspace/legacyBridge/intellij/LegacyBridgeModuleManagerComponent.kt
+++ b/platform/workspaceModel-ide/src/com/intellij/workspace/legacyBridge/intellij/LegacyBridgeModuleManagerComponent.kt
@@ -26,7 +26,6 @@ import com.intellij.workspace.bracket
 import com.intellij.workspace.executeOrQueueOnDispatchThread
 import com.intellij.workspace.ide.*
 import com.intellij.workspace.jps.JpsProjectEntitiesLoader
-import com.intellij.workspace.legacyBridge.libraries.libraries.LegacyBridgeLibraryImpl
 import org.jetbrains.annotations.ApiStatus
 import java.io.File
 import java.util.*
@@ -429,21 +428,6 @@ class LegacyBridgeModuleManagerComponent(private val project: Project) : ModuleM
   override fun findModuleByName(name: String): Module? = modulesMap[ModuleId(name)]
 
   override fun disposeModule(module: Module) = ApplicationManager.getApplication().runWriteAction {
-    module as LegacyBridgeModule
-
-    // Remove module libraries for that module
-    val moduleRootManager = ModuleRootManager.getInstance(module)
-    moduleRootManager.modifiableModel.let { rootModel ->
-      rootModel.moduleLibraryTable.libraries.forEach {
-        it as LegacyBridgeLibraryImpl
-        val libraryTableId = it.entityId.tableId
-        if (libraryTableId is LibraryTableId.ModuleLibraryTableId && libraryTableId.moduleId == module.moduleEntityId) {
-          rootModel.moduleLibraryTable.removeLibrary(it)
-        }
-      }
-      rootModel.commit()
-    }
-
     val modifiableModel = modifiableModel
     modifiableModel.disposeModule(module)
     modifiableModel.commit()