@@ -8,9 +8,9 @@ import org.jetbrains.bazel.label.Label
88import org.jetbrains.bsp.bazel.bazelrunner.BazelProcessResult
99import org.jetbrains.bsp.bazel.bazelrunner.BazelRunner
1010import org.jetbrains.bsp.bazel.logger.BspClientLogger
11- import org.jetbrains.bsp.bazel.server.bzlmod.rootRulesToNeededTransitiveRules
1211import org.jetbrains.bsp.bazel.server.bzlmod.BzlmodRepoMapping
1312import org.jetbrains.bsp.bazel.server.bzlmod.RepoMapping
13+ import org.jetbrains.bsp.bazel.server.bzlmod.rootRulesToNeededTransitiveRules
1414import org.jetbrains.bsp.bazel.workspacecontext.EnabledRulesSpec
1515import org.w3c.dom.Document
1616import org.w3c.dom.NodeList
@@ -43,14 +43,16 @@ class BazelExternalRulesetsQueryImpl(
4343 enabledRules.isNotEmpty() -> BazelEnabledRulesetsQueryImpl (enabledRules).fetchExternalRulesetNames(cancelChecker)
4444 else ->
4545 BazelBzlModExternalRulesetsQueryImpl (
46- bazelRunner,
47- isBzlModEnabled,
48- bspClientLogger, repoMapping
49- ).fetchExternalRulesetNames(cancelChecker) + BazelWorkspaceExternalRulesetsQueryImpl (
46+ bazelRunner,
47+ isBzlModEnabled,
48+ bspClientLogger,
49+ repoMapping,
50+ ).fetchExternalRulesetNames(cancelChecker) +
51+ BazelWorkspaceExternalRulesetsQueryImpl (
5052 bazelRunner,
5153 isWorkspaceEnabled,
5254 bspClientLogger,
53- ).fetchExternalRulesetNames(cancelChecker)
55+ ).fetchExternalRulesetNames(cancelChecker)
5456 }
5557}
5658
@@ -126,9 +128,9 @@ class BazelBzlModExternalRulesetsQueryImpl(
126128 graph { options.add(" --output=json" ) }
127129 }
128130 val apparentRepoNameToCanonicalName =
129- (repoMapping as ? BzlmodRepoMapping )?.apparentRepoNameToCanonicalName ? : emptyMap()
131+ (repoMapping as ? BzlmodRepoMapping )?.apparentRepoNameToCanonicalName ? : emptyMap()
130132 val canonicalNameToApparentRepoName =
131- apparentRepoNameToCanonicalName.entries.associateBy({it.value}) { it.key}
133+ apparentRepoNameToCanonicalName.entries.associateBy({ it.value }) { it.key }
132134 val bzlmodGraphJson =
133135 bazelRunner
134136 .runBazelCommand(command, logProcessOutput = false , serverPidFuture = null )
@@ -154,8 +156,9 @@ class BazelBzlModExternalRulesetsQueryImpl(
154156 .flatten()
155157
156158 fun toApparentName (canonicalName : String ) = canonicalNameToApparentRepoName.get(canonicalName)
157- val deps = (directDeps + indirectDeps)
158- .map { toApparentName(" $it ~" ) ? : toApparentName(" $it +" ) ? : it}
159+ val deps =
160+ (directDeps + indirectDeps)
161+ .map { toApparentName(" $it ~" ) ? : toApparentName(" $it +" ) ? : it }
159162 .distinct()
160163
161164 return deps
0 commit comments