Skip to content

Commit 9a0dbe8

Browse files
committed
refactor(bazel): Slightly simplify a case distinction
Code the fallback to empty set only once. Signed-off-by: Frank Viernau <[email protected]>
1 parent 194b071 commit 9a0dbe8

File tree

1 file changed

+4
-6
lines changed
  • plugins/package-managers/bazel/src/main/kotlin

1 file changed

+4
-6
lines changed

plugins/package-managers/bazel/src/main/kotlin/Bazel.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,10 @@ class Bazel(
206206
archiveOverrides
207207
)
208208

209-
val conanExtension = mainModule.extensionUsages.find { "conan_deps_module_extension.bzl" in it.key }
210-
val conanPackages = if (!config.bazelDependenciesOnly) {
211-
conanExtension?.let { extension ->
209+
val conanPackages = mainModule.extensionUsages
210+
.find { "conan_deps_module_extension.bzl" in it.key }
211+
.takeUnless { config.bazelDependenciesOnly }
212+
?.let { extension ->
212213
val conanAnalyzerResults = resolveConanDependencies(
213214
projectDir,
214215
analysisRoot,
@@ -223,9 +224,6 @@ class Bazel(
223224
conanAnalyzerResults
224225
)
225226
}.orEmpty()
226-
} else {
227-
emptySet()
228-
}
229227

230228
// If no lockfile is present, getDependencyGraph() runs "bazel mod graph", which creates a "MODULE.bazel.lock"
231229
// file as a side effect. That file contains the URL of the Bazel module registry that was used for dependency

0 commit comments

Comments
 (0)