Skip to content

Use worktree environment for spawning the language server #24

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
MrSubidubi merged 3 commits into from
Feb 3, 2026
Merged

Use worktree environment for spawning the language server #24

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
486112d
refactor: use worktree env for spawning the language server.
SKalt Jan 28, 2026
9ff8e44
chore: fix clippy lints
SKalt Feb 2, 2026
f4fe133
fix: path to extension-specific installation of bash-language-server
SKalt Feb 3, 2026
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
21 changes: 15 additions & 6 deletions src/bash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ struct BashExtension {

impl BashExtension {
fn server_exists(&self) -> bool {
fs::metadata(SERVER_PATH).map_or(false, |stat| stat.is_file())
fs::metadata(SERVER_PATH).is_ok_and(|stat| stat.is_file())
}

fn server_script_path(&mut self, id: &zed::LanguageServerId) -> Result<String> {
Expand Down Expand Up @@ -64,20 +64,29 @@ impl zed::Extension for BashExtension {
fn language_server_command(
&mut self,
id: &zed::LanguageServerId,
_worktree: &zed::Worktree,
worktree: &zed::Worktree,
) -> Result<zed::Command> {
let server_path = self.server_script_path(&id)?;
let shell_env = worktree.shell_env();
if let Some(cmd) = worktree.which(PACKAGE_NAME) {
return Ok(zed::Command {
command: cmd.clone(),
args: vec!["start".to_string()],
env: shell_env,
});
}
// TODO: consider drawing `bash_language_server` from the worktree's own `./node_modules/`
let extension_work_dir = env::current_dir().unwrap();
let server_path = self.server_script_path(id)?;
Ok(zed::Command {
command: zed::node_binary_path()?,
args: vec![
env::current_dir()
.unwrap()
extension_work_dir
.join(&server_path)
.to_string_lossy()
.to_string(),
"start".to_string(),
],
env: Default::default(),
env: shell_env,
})
}

Expand Down