PY-86744: Ignore cases when comparing project names and paths and add test.

throwable-one · intellij-monorepo-bot · commit e80fdcb1b8ad · 2026-01-29T05:20:13.000Z
When dropping existing modules using `removeFakeModuleAndConflictingEntities` we should ignore case.

GitOrigin-RevId: 2314f1916d1f2e43bce699703bdf8800c543f6b3
diff --git a/python/python-pyproject/src/com/intellij/python/pyproject/model/internal/workspaceBridge/workspaceTools.kt b/python/python-pyproject/src/com/intellij/python/pyproject/model/internal/workspaceBridge/workspaceTools.kt
@@ -2,6 +2,7 @@ package com.intellij.python.pyproject.model.internal.workspaceBridge
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.NlsSafe
+import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.platform.backend.workspace.workspaceModel
 import com.intellij.platform.workspace.jps.entities.*
 import com.intellij.platform.workspace.storage.EntitySource
@@ -280,16 +281,17 @@ private data class PyProjectTomlBasedEntryImpl(
  * @see com.intellij.openapi.project.impl.getOrInitializeModule
  */
 private fun removeFakeModuleAndConflictingEntities(storage: MutableEntityStorage, newModules: Sequence<ModuleEntity>) {
-  val contentsToRemove = newModules.flatMap { content -> content.contentRoots.map { it.url } }.toSet()
-  val namesToRemove = newModules.map { it.name }.toSet()
+  val vfsManager = VirtualFileManager.getInstance()
+  val contentsToRemove = newModules.flatMap { content -> content.contentRoots.map { vfsManager.findFileByUrl(it.url.url)!! } }.toSet()
+  val namesToRemove = newModules.map { it.name.lowercase() }.toSet()
   val modulesToRemove = storage.entities(ModuleEntity::class.java)
     .filter { moduleEntity ->
       moduleEntity.type == PYTHON_MODULE_ID // Python module
       && (
         // Intersects with new module content root
-        moduleEntity.contentRoots.map { it.url }.any { it in contentsToRemove } ||
+        moduleEntity.contentRoots.map { vfsManager.findFileByUrl(it.url.url) }.any { it in contentsToRemove } ||
         // Intersects by name
-        moduleEntity.name in namesToRemove ||
+        moduleEntity.name.lowercase() in namesToRemove ||
         // Auto-generated, temporary module
         moduleEntity.entitySource is NonPersistentEntitySource
          )
