MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

[jps-to-bazel] Fix getting target name when module is in ultimate home dir in BazelBuildFileGeneratorKt#jpsModuleNameToBazelBuildName

Browse Source 
GitOrigin-RevId: 893f5416f4e54e9b3e50e9a8bc794f9ebb5b10e0
This commit is contained in:
Ilia Kirianovskii
2025-05-14 15:44:54 +02:00
committed by intellij-monorepo-bot
parent 1b923273c9
commit 8d411925f2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt
View File

@@ -756,8 +756,8 @@ private fun jpsModuleNameToBazelBuildName(module: JpsModule, baseBuildDir: Path,
return customModule.bazelTargetName
}
val baseDirFilename = baseBuildDir.fileName.toString()
if (baseDirFilename != "resources" &&
val baseDirFilename = if (baseBuildDir == projectDir) null else baseBuildDir.fileName.toString()
if (baseDirFilename != null && baseDirFilename != "resources" &&
(moduleName.endsWith(".$baseDirFilename") || (camelToSnakeCase(moduleName, '-')).endsWith(".$baseDirFilename"))) {
return baseDirFilename
}
@@ -767,9 +767,9 @@ private fun jpsModuleNameToBazelBuildName(module: JpsModule, baseBuildDir: Path,
.removePrefix("intellij.idea.community.")
.removePrefix("intellij.")
val parentDirDirName = if (baseBuildDir.parent == projectDir) "idea" else baseBuildDir.parent.fileName
val parentDirDirName = if (baseBuildDir == projectDir) null else if (baseBuildDir.parent == projectDir) "idea" else baseBuildDir.parent.fileName.toString()
return result
.removePrefix("$parentDirDirName.")
.let { if (parentDirDirName != null) it.removePrefix("$parentDirDirName.") else it }
.replace('.', '-')
}