Skip to content

Commit

Permalink
Follow-up on zed-industries#18447: Unintentional deletion during merg…
Browse files Browse the repository at this point in the history
…e-conflicts resolution (zed-industries#20991)

After zed-industries#18447 was merged, I reviewed the PR code as usual. During this
review, I realized that some code was unintentionally removed when I was
resolving merge conflicts in zed-industries#18447.

Sorry!

Release Notes:

- N/A
  • Loading branch information
JunkuiZhang authored and Anthony-Eid committed Nov 22, 2024
1 parent 09e347a commit 15ad146
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion crates/languages/src/go.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ impl super::LspAdapter for GoLspAdapter {
let gobin_dir = container_dir.join("gobin");
fs::create_dir_all(&gobin_dir).await?;

let install_output = util::command::new_smol_command("go")
let go = delegate.which("go".as_ref()).await.unwrap_or("go".into());
let install_output = util::command::new_smol_command(go)
.env("GO111MODULE", "on")
.env("GOBIN", &gobin_dir)
.args(["install", "golang.org/x/tools/gopls@latest"])
Expand Down

0 comments on commit 15ad146

Please sign in to comment.