Merge branch 'master' into bzlmod

Cargo.toml

@@ -7,6 +7,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.79"
+clap = { version = "4.4.18", features = ["derive"] }
 either = "1.9.0"
 itertools = "0.12.0"
 lsp-types = "0.94.1"

src/client.rs

@@ -1,4 +1,8 @@
-use std::{collections::HashMap, process::Command};
+use std::{
+    collections::HashMap,
+    path::{Path, PathBuf},
+    process::Command,
+};
 
 use anyhow::anyhow;
 
@@ -16,11 +20,21 @@ pub(crate) trait BazelClient {
     fn dump_repo_mapping(&self, repo: &str) -> anyhow::Result<HashMap<String, String>>;
 }
 
-pub(crate) struct BazelCli;
+pub(crate) struct BazelCli {
+    bazel: PathBuf,
+}
+
+impl BazelCli {
+    pub fn new<P: AsRef<Path>>(bazel: P) -> Self {
+        Self {
+            bazel: bazel.as_ref().to_owned(),
+        }
+    }
+}
 
 impl BazelClient for BazelCli {
     fn info(&self) -> anyhow::Result<BazelInfo> {
-        let output = Command::new("bazel")
+        let output = Command::new(&self.bazel)
             .arg("info")
             .current_dir(std::env::current_dir()?)
             .output()?;
@@ -49,16 +63,14 @@ impl BazelClient for BazelCli {
     }
 
     fn dump_repo_mapping(&self, repo: &str) -> anyhow::Result<HashMap<String, String>> {
-        let output = Command::new("bazel")
+        let output = Command::new(&self.bazel)
             .args(["mod", "dump_repo_mapping"])
             .arg(repo)
             .current_dir(std::env::current_dir()?)
             .output()?;
 
         if !output.status.success() {
-            return Err(anyhow!(
-                "Command `bazel mod dump_repo_mapping` failed"
-            ));
+            return Err(anyhow!("Command `bazel mod dump_repo_mapping` failed"));
         }
 
         Ok(serde_json::from_slice(&output.stdout)?)

src/main.rs

@@ -5,12 +5,32 @@ mod label;
 #[cfg(test)]
 pub mod test_fixture;
 
+use std::path::PathBuf;
+
 use bazel::BazelContext;
+use clap::Parser;
 use client::BazelCli;
 use eval::ContextMode;
 
+#[derive(Parser, Debug)]
+#[command(author, version, about, long_about = None)]
+struct Args {
+    /// Location of the bazel binary
+    #[arg(long, default_value = "bazel")]
+    bazel: PathBuf,
+}
+
 fn main() -> anyhow::Result<()> {
-    let ctx = BazelContext::new(BazelCli, ContextMode::Check, true, &[], true)?;
+    let args = Args::parse();
+
+    let ctx = BazelContext::new(
+        BazelCli::new(args.bazel),
+        ContextMode::Check,
+        true,
+        &[],
+        true,
+    )?;
+
     starlark_lsp::server::stdio_server(ctx)?;
 
     Ok(())