Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions crates/project/src/lsp_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12755,7 +12755,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 {
Expand All @@ -12765,14 +12764,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 {
Expand Down
Loading