Skip to content

Commit 1f8f9f2

Browse files
authored
Merge pull request #27 from ormaniec/ormaniec/fix-python-auto-embbeding/1
Update auto adding `python_rules` to all bazel 8.x.x deployments
2 parents 5f3e0ff + 5f8851e commit 1f8f9f2

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

server/server/src/main/kotlin/org/jetbrains/bsp/bazel/server/bsp/managers/BazelBspAspectsManager.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,17 @@ class BazelBspAspectsManager(
7777

7878
private fun List<RulesetLanguage>.addExternalPythonLanguageIfNeeded(externalRulesetNames: List<String>): List<RulesetLanguage> {
7979
val rulesetName = Language.Python.rulesetNames.firstOrNull { externalRulesetNames.contains(it) }
80-
return this.filterNot { it.language == Language.Python } + RulesetLanguage(rulesetName, Language.Python)
80+
return when {
81+
bazelRelease.major >= 8 ->
82+
if (featureFlags.isPythonSupportEnabled) {
83+
this.filterNot { it.language == Language.Python } + RulesetLanguage(rulesetName, Language.Python)
84+
} else {
85+
this
86+
}
87+
else ->
88+
// For bazel version < 8, python is embedded.
89+
this.filterNot { it.language == Language.Python } + RulesetLanguage(rulesetName, Language.Python)
90+
}
8191
}
8292

8393
fun generateAspectsFromTemplates(

0 commit comments

Comments
 (0)