From 969c97e1df526cab3d6c7d8ebe68f3248a55db6e Mon Sep 17 00:00:00 2001 From: Ilia Kirianovskii Date: Sun, 12 Oct 2025 17:02:06 +0200 Subject: [PATCH] [jps-to-bazel] Generate dependencies if no source roots but resources in BazelBuildFileGenerator#computeModuleList (IJI-3028) Mainly to fix an incomplete dependency graph. GitOrigin-RevId: 0c77426eeecce04a8b86bf2df668ad15d65c22e8 --- .../intellij/build/bazel/BazelBuildFileGenerator.kt | 9 ++++++--- .../src/org/jetbrains/intellij/build/bazel/dependency.kt | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt b/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt index 0a31106f82c7..bf7690bd887c 100644 --- a/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt +++ b/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt @@ -335,12 +335,15 @@ internal class BazelBuildFileGenerator( val result = ModuleList(community = community, ultimate = ultimate, skippedModules = skippedModules) for (module in (community + ultimate)) { val hasSources = module.sources.isNotEmpty() - if (hasSources || module.testSources.isEmpty()) { + val hasResources = module.resources.isNotEmpty() + val hasTestSources = module.testSources.isNotEmpty() + val hasTestResources = module.testResources.isNotEmpty() + + if (hasSources || hasResources || !hasTestSources) { result.deps.put(module, generateDeps(m2Repo, module = module, isTest = false, context = this, hasSources = hasSources)) } - val hasTestSources = module.testSources.isNotEmpty() - if (hasTestSources || isTestClasspathModule(module)) { + if (hasTestSources || hasTestResources || isTestClasspathModule(module)) { result.testDeps.put(module, generateDeps(m2Repo = m2Repo, module = module, hasSources = hasTestSources, isTest = true, context = this)) } } diff --git a/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/dependency.kt b/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/dependency.kt index dcf10f32dbf0..d2550eeb56ed 100644 --- a/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/dependency.kt +++ b/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/dependency.kt @@ -61,12 +61,12 @@ internal fun generateDeps( val runtimeDeps = mutableListOf() val provided = mutableListOf() - if (isTest && module.sources.isNotEmpty()) { - if (hasSources) { + if (isTest) { + if (hasSources && module.sources.isNotEmpty()) { // associates also is a dependency associates.add(BazelLabel(":${module.targetName}", module)) } - else { + else if (module.sources.isNotEmpty() || module.resources.isNotEmpty()) { runtimeDeps.add(BazelLabel(":${module.targetName}", module)) } }