Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the project env when running LSPs (#20641)

Browse source 
This change ensures we always run LSPs with the project environment (in
addition to any overrides they provide). This helps ensure the
environment is
set correctly on remotes where we don't load the login shell environment
and
assign it to the current process.

Also fixed the go language to use the project env to find the go
command.

Release Notes:

- Improved environment variable handling for SSH remotes
This commit is contained in:
Conrad Irwin 2024-11-14 12:26:55 -07:00 • committed by GitHub
parent 56c93be4de
commit 7f52071513
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/languages/src/go.rs
View file

@ -89,8 +89,7 @@ impl super::LspAdapter for GoLspAdapter {
let delegate = delegate.clone(); let delegate = delegate.clone();
Some(cx.spawn(|cx| async move { Some(cx.spawn(|cx| async move {
let install_output = process::Command::new("go").args(["version"]).output().await; if delegate.which("go".as_ref()).await.is_none() {
if install_output.is_err() {
if DID_SHOW_NOTIFICATION if DID_SHOW_NOTIFICATION
.compare_exchange(false, true, SeqCst, SeqCst) .compare_exchange(false, true, SeqCst, SeqCst)
.is_ok() .is_ok()
@ -139,7 +138,8 @@ impl super::LspAdapter for GoLspAdapter {
let gobin_dir = container_dir.join("gobin"); let gobin_dir = container_dir.join("gobin");
fs::create_dir_all(&gobin_dir).await?; fs::create_dir_all(&gobin_dir).await?;
let install_output = process::Command::new("go") let go = delegate.which("go".as_ref()).await.unwrap_or("go".into());
let install_output = process::Command::new(go)
.env("GO111MODULE", "on") .env("GO111MODULE", "on")
.env("GOBIN", &gobin_dir) .env("GOBIN", &gobin_dir)
.args(["install", "golang.org/x/tools/gopls@latest"]) .args(["install", "golang.org/x/tools/gopls@latest"])

13
crates/project/src/lsp_store.rs
View file

@ -5540,16 +5540,9 @@ impl LspStore {
binary.arguments = arguments.into_iter().map(Into::into).collect(); binary.arguments = arguments.into_iter().map(Into::into).collect();
} }
// If we do have a project environment (either by spawning a shell in in the project directory let mut shell_env = delegate.shell_env().await;
// or by getting it from the CLI) and the language server command itself shell_env.extend(binary.env.unwrap_or_default());
// doesn't have an environment, then we use the project environment. binary.env = Some(shell_env);
if binary.env.is_none() {
log::info!(
"using project environment for language server {:?}",
adapter.name()
);
binary.env = Some(delegate.shell_env().await);
}
Ok(binary) Ok(binary)
}) })
} }