project: Always use shell env in LocalLspAdapterDelegate::which (#40237)

Windows not having a default shell does not matter here, we might still
have an environment from other means (by being spawned from the cli for
example).

Release Notes:

- N/A *or* Added/Fixed/Improved ...
This commit is contained in:
Lukas Wirth
2025-10-15 08:06:37 +00:00
committed by GitHub
parent 6d8d2e2989
commit a6e99c1c16
-9
View File
@@ -12750,7 +12750,6 @@ impl LspAdapterDelegate for LocalLspAdapterDelegate {
return Ok(None);
}
#[cfg(not(target_os = "windows"))]
async fn which(&self, command: &OsStr) -> Option<PathBuf> {
let mut worktree_abs_path = self.worktree_root_path().to_path_buf();
if self.fs.is_file(&worktree_abs_path).await {
@@ -12760,14 +12759,6 @@ impl LspAdapterDelegate for LocalLspAdapterDelegate {
which::which_in(command, shell_path.as_ref(), worktree_abs_path).ok()
}
#[cfg(target_os = "windows")]
async fn which(&self, command: &OsStr) -> Option<PathBuf> {
// todo(windows) Getting the shell env variables in a current directory on Windows is more complicated than other platforms
// there isn't a 'default shell' necessarily. The closest would be the default profile on the windows terminal
// SEE: https://learn.microsoft.com/en-us/windows/terminal/customize-settings/startup
which::which(command).ok()
}
async fn try_exec(&self, command: LanguageServerBinary) -> Result<()> {
let mut working_dir = self.worktree_root_path().to_path_buf();
if self.fs.is_file(&working_dir).await {