mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-30 22:34:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Properly dedup restarts of language servers

Browse source
This commit is contained in:
Keith Simmons 2022-03-29 17:41:36 -07:00
parent 6d91fd078c
commit ec57c1f4ac
3 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/editor/src/editor.rs
View file

@ -4871,14 +4871,11 @@ impl Editor {
} }
fn restart_language_server(&mut self, _: &RestartLanguageServer, cx: &mut ViewContext<Self>) { fn restart_language_server(&mut self, _: &RestartLanguageServer, cx: &mut ViewContext<Self>) {
let project = self.project.clone(); if let Some(project) = self.project.clone() {
if let Some(project) = project {
self.buffer.update(cx, |multi_buffer, cx| { self.buffer.update(cx, |multi_buffer, cx| {
for buffer in multi_buffer.all_buffers() { project.update(cx, |project, cx| {
project.update(cx, |project, cx| { project.restart_language_servers_for_buffers(multi_buffer.all_buffers(), cx);
project.restart_language_server_for_buffer(&buffer, cx); });
});
}
}) })
} }
} }

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

@ -1508,18 +1508,26 @@ impl Project {
}); });
} }
pub fn restart_language_server_for_buffer( pub fn restart_language_servers_for_buffers(
&mut self, &mut self,
buffer: &ModelHandle<Buffer>, buffers: impl IntoIterator<Item = ModelHandle<Buffer>>,
cx: &mut ModelContext<Self>, cx: &mut ModelContext<Self>,
) -> Option<()> { ) -> Option<()> {
let file = File::from_dyn(buffer.read(cx).file())?; let language_server_lookup_info: HashSet<(WorktreeId, Arc<Path>, PathBuf)> = buffers
let worktree = file.worktree.read(cx).as_local()?; .into_iter()
let worktree_id = worktree.id(); .filter_map(|buffer| {
let worktree_abs_path = worktree.abs_path().clone(); let file = File::from_dyn(buffer.read(cx).file())?;
let full_path = buffer.read(cx).file()?.full_path(cx); let worktree = file.worktree.read(cx).as_local()?;
let language = self.languages.select_language(&full_path)?; let worktree_id = worktree.id();
self.restart_language_server(worktree_id, worktree_abs_path, language, cx); let worktree_abs_path = worktree.abs_path().clone();
let full_path = file.full_path(cx);
Some((worktree_id, worktree_abs_path, full_path))
})
.collect();
for (worktree_id, worktree_abs_path, full_path) in language_server_lookup_info {
let language = self.languages.select_language(&full_path)?;
self.restart_language_server(worktree_id, worktree_abs_path, language, cx);
}
None None
} }

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

@ -80,7 +80,6 @@ action!(Save);
action!(DebugElements); action!(DebugElements);
action!(ActivatePreviousPane); action!(ActivatePreviousPane);
action!(ActivateNextPane); action!(ActivateNextPane);
action!(RestartLanguageServer);
pub fn init(client: &Arc<Client>, cx: &mut MutableAppContext) { pub fn init(client: &Arc<Client>, cx: &mut MutableAppContext) {
pane::init(cx); pane::init(cx);
@ -120,9 +119,6 @@ pub fn init(client: &Arc<Client>, cx: &mut MutableAppContext) {
cx.add_action(|workspace: &mut Workspace, _: &ActivateNextPane, cx| { cx.add_action(|workspace: &mut Workspace, _: &ActivateNextPane, cx| {
workspace.activate_next_pane(cx) workspace.activate_next_pane(cx)
}); });
cx.add_action(|workspace: &mut Workspace, _: &RestartLanguageServer, cx| {
workspace.restart_language_server(cx)
});
cx.add_bindings(vec![ cx.add_bindings(vec![
Binding::new("ctrl-alt-cmd-f", FollowNextCollaborator, None), Binding::new("ctrl-alt-cmd-f", FollowNextCollaborator, None),
Binding::new("cmd-s", Save, None), Binding::new("cmd-s", Save, None),
@ -1423,8 +1419,6 @@ impl Workspace {
None None
} }
fn restart_language_server(&mut self, cx: &mut ViewContext<Self>) {}
fn render_connection_status(&self, cx: &mut RenderContext<Self>) -> Option<ElementBox> { fn render_connection_status(&self, cx: &mut RenderContext<Self>) -> Option<ElementBox> {
let theme = &cx.global::<Settings>().theme; let theme = &cx.global::<Settings>().theme;
match &*self.client.status().borrow() { match &*self.client.status().borrow() {