mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 20:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Restart LSP server on initialization options change

Browse source
This commit is contained in:
Kirill Bulatov 2023-07-06 23:08:04 +03:00
parent 3ca0170264
commit fff65968bf
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
crates/project/src/project.rs
View file

@ -777,20 +777,32 @@ impl Project {
} }
let mut language_servers_to_stop = Vec::new(); let mut language_servers_to_stop = Vec::new();
let mut language_servers_to_restart = Vec::new();
let languages = self.languages.to_vec(); let languages = self.languages.to_vec();
let project_settings = settings::get::<ProjectSettings>(cx).clone();
for (worktree_id, started_lsp_name) in self.language_server_ids.keys() { for (worktree_id, started_lsp_name) in self.language_server_ids.keys() {
let language = languages.iter().find(|l| { let language = languages.iter().find_map(|l| {
l.lsp_adapters() let adapter = l
.lsp_adapters()
.iter() .iter()
.any(|adapter| &adapter.name == started_lsp_name) .find(|adapter| &adapter.name == started_lsp_name)?;
Some((l, adapter))
}); });
if let Some(language) = language { if let Some((language, adapter)) = language {
let worktree = self.worktree_for_id(*worktree_id, cx); let worktree = self.worktree_for_id(*worktree_id, cx);
let file = worktree.and_then(|tree| { let file = worktree.as_ref().and_then(|tree| {
tree.update(cx, |tree, cx| tree.root_file(cx).map(|f| f as _)) tree.update(cx, |tree, cx| tree.root_file(cx).map(|f| f as _))
}); });
if !language_settings(Some(language), file.as_ref(), cx).enable_language_server { if !language_settings(Some(language), file.as_ref(), cx).enable_language_server {
language_servers_to_stop.push((*worktree_id, started_lsp_name.clone())); language_servers_to_stop.push((*worktree_id, started_lsp_name.clone()));
} else if let Some(worktree) = worktree {
let new_lsp_settings = project_settings
.lsp
.get(&adapter.name.0)
.and_then(|s| s.initialization_options.as_ref());
if adapter.initialization_options.as_ref() != new_lsp_settings {
language_servers_to_restart.push((worktree, Arc::clone(language)));
}
} }
} }
} }
@ -807,6 +819,11 @@ impl Project {
self.start_language_servers(&worktree, worktree_path, language, cx); self.start_language_servers(&worktree, worktree_path, language, cx);
} }
// Restart all language servers with changed initialization options.
for (worktree, language) in language_servers_to_restart {
self.restart_language_servers(worktree, language, cx);
}
if !self.copilot_enabled && Copilot::global(cx).is_some() { if !self.copilot_enabled && Copilot::global(cx).is_some() {
self.copilot_enabled = true; self.copilot_enabled = true;
for buffer in self.opened_buffers.values() { for buffer in self.opened_buffers.values() {

1
crates/workspace/src/workspace.rs
View file

@ -4809,6 +4809,7 @@ mod tests {
theme::init((), cx); theme::init((), cx);
language::init(cx); language::init(cx);
crate::init_settings(cx); crate::init_settings(cx);
Project::init_settings(cx);
}); });
} }
} }