MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] remove hacks with dependencies on builtins from KaLibraryModule implementation

Browse Source 
see KT-74010 for details

^KT-74010 obsolete

GitOrigin-RevId: be39ca252792ef8eceba9b52e5a6fe87e17fc2a7
This commit is contained in:
Ilya Kirillov
2025-09-29 21:40:52 +00:00
committed by intellij-monorepo-bot
parent 232ba627f9
commit 19ded27232
4 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/base/fir/project-structure/src/org/jetbrains/kotlin/idea/base/fir/projectStructure/modules/library/KaEntityBasedLibraryModuleBase.kt
+1 -5
View File
@@ -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()
}
plugins/kotlin/base/fir/project-structure/test/org/jetbrains/kotlin/idea/base/fir/projectStructure/KaModuleStructureMermaidRenderer.kt
-2
View File
@@ -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()
plugins/kotlin/base/fir/project-structure/test/org/jetbrains/kotlin/idea/base/fir/projectStructure/KaModuleStructureTxtRenderer.kt
+1 -1
View File
@@ -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)
}
plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/tests/org/jetbrains/kotlin/gradle/scripting/k2/projectStructure/GradleScriptProjectStructureTest.kt
-2
View File
@@ -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> {