From 19ded272321b9cdad5accdf73ff1ce9864abd2dd Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 29 Sep 2025 17:20:38 +0200
Subject: [PATCH] [kotlin] remove hacks with dependencies on builtins from
 `KaLibraryModule` implementation

see KT-74010 for details

^KT-74010 obsolete

GitOrigin-RevId: be39ca252792ef8eceba9b52e5a6fe87e17fc2a7
---
 .../modules/library/KaEntityBasedLibraryModuleBase.kt       | 6 +-----
 .../projectStructure/KaModuleStructureMermaidRenderer.kt    | 2 --
 .../fir/projectStructure/KaModuleStructureTxtRenderer.kt    | 2 +-
 .../k2/projectStructure/GradleScriptProjectStructureTest.kt | 2 --
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/plugins/kotlin/base/fir/project-structure/src/org/jetbrains/kotlin/idea/base/fir/projectStructure/modules/library/KaEntityBasedLibraryModuleBase.kt b/plugins/kotlin/base/fir/project-structure/src/org/jetbrains/kotlin/idea/base/fir/projectStructure/modules/library/KaEntityBasedLibraryModuleBase.kt
index 77a048597d4f..82805e5dcc97 100644
--- a/plugins/kotlin/base/fir/project-structure/src/org/jetbrains/kotlin/idea/base/fir/projectStructure/modules/library/KaEntityBasedLibraryModuleBase.kt
+++ b/plugins/kotlin/base/fir/project-structure/src/org/jetbrains/kotlin/idea/base/fir/projectStructure/modules/library/KaEntityBasedLibraryModuleBase.kt
@@ -38,11 +38,7 @@ abstract class KaEntityBasedLibraryModuleBase<E : WorkspaceEntityWithSymbolicId,
 
     override val directDependsOnDependencies: List<KaModule> get() = emptyList()
     override val directFriendDependencies: List<KaModule> get() = emptyList()
-
-    @OptIn(KaImplementationDetail::class)
-    override val directRegularDependencies: List<KaModule>
-        // should be empty, mitigation of KT-74010
-        get() = listOf(KaBuiltinsModuleImpl(targetPlatform, project))
+    override val directRegularDependencies: List<KaModule> get() = emptyList()
 
     override val transitiveDependsOnDependencies: List<KaModule> get() = emptyList()
 }
diff --git a/plugins/kotlin/base/fir/project-structure/test/org/jetbrains/kotlin/idea/base/fir/projectStructure/KaModuleStructureMermaidRenderer.kt b/plugins/kotlin/base/fir/project-structure/test/org/jetbrains/kotlin/idea/base/fir/projectStructure/KaModuleStructureMermaidRenderer.kt
index 43d174c2ffd6..e30608d426b6 100644
--- a/plugins/kotlin/base/fir/project-structure/test/org/jetbrains/kotlin/idea/base/fir/projectStructure/KaModuleStructureMermaidRenderer.kt
+++ b/plugins/kotlin/base/fir/project-structure/test/org/jetbrains/kotlin/idea/base/fir/projectStructure/KaModuleStructureMermaidRenderer.kt
@@ -59,8 +59,6 @@ object KaModuleStructureMermaidRenderer {
 
                 val dependencies = buildList {
                     regularDependencies
-                        /* mitigation of KT-74010 */
-                        .filter { (_, to) -> to !is KaBuiltinsModule }
                         .map { (from, to) -> "${from.nodeId()} --> ${to.nodeId()}" }.sorted()
                         .mapTo(this) { it to DependencyKind.Regular }
                     friendDependencies.map { (from, to) -> "${from.nodeId()} --friend--> ${to.nodeId()}" }.sorted()
diff --git a/plugins/kotlin/base/fir/project-structure/test/org/jetbrains/kotlin/idea/base/fir/projectStructure/KaModuleStructureTxtRenderer.kt b/plugins/kotlin/base/fir/project-structure/test/org/jetbrains/kotlin/idea/base/fir/projectStructure/KaModuleStructureTxtRenderer.kt
index 651788571c5a..217359238779 100644
--- a/plugins/kotlin/base/fir/project-structure/test/org/jetbrains/kotlin/idea/base/fir/projectStructure/KaModuleStructureTxtRenderer.kt
+++ b/plugins/kotlin/base/fir/project-structure/test/org/jetbrains/kotlin/idea/base/fir/projectStructure/KaModuleStructureTxtRenderer.kt
@@ -71,7 +71,7 @@ object KaModuleStructureTxtRenderer {
                 }
             }
         }
-        renderDependenciesByType("regularDependencies", module.directRegularDependencies.filter { it !is KaBuiltinsModule /* mitigation of KT-74010 */  })
+        renderDependenciesByType("regularDependencies", module.directRegularDependencies)
         renderDependenciesByType("friendDependencies", module.directFriendDependencies)
         renderDependenciesByType("dependsOnDependencies", module.directDependsOnDependencies)
     }
diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/tests/org/jetbrains/kotlin/gradle/scripting/k2/projectStructure/GradleScriptProjectStructureTest.kt b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/tests/org/jetbrains/kotlin/gradle/scripting/k2/projectStructure/GradleScriptProjectStructureTest.kt
index 768d996e8ac9..ed0c6748e71d 100644
--- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/tests/org/jetbrains/kotlin/gradle/scripting/k2/projectStructure/GradleScriptProjectStructureTest.kt
+++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/tests/org/jetbrains/kotlin/gradle/scripting/k2/projectStructure/GradleScriptProjectStructureTest.kt
@@ -107,8 +107,6 @@ class GradleScriptProjectStructureTest : AbstractGradleCodeInsightTest() {
         val files = testDataFiles.map { getFile(it.path).getPsiFile(project) }
         val modules = files.map { it.getKaModule(project, useSiteModule = null) }
         return modules.computeDependenciesClosure()
-            // should not be here empty, mitigation of KT-74010
-            .filter { it !is KaBuiltinsModule }
     }
 
     private fun Collection<KaModule>.computeDependenciesClosure(): List<KaModule> {