Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid bailing out of Project::symbols when one LSP request fails

Browse source
This commit is contained in:
Max Brunsfeld 2022-04-11 21:09:01 -07:00
parent e9214dc05d
commit ae9f71cc07
1 changed files with 65 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2270,86 +2270,81 @@ impl Project {
pub fn symbols(&self, query: &str, cx: &mut ModelContext<Self>) -> Task<Result<Vec<Symbol>>> { pub fn symbols(&self, query: &str, cx: &mut ModelContext<Self>) -> Task<Result<Vec<Symbol>>> {
if self.is_local() { if self.is_local() {
let mut language_servers = HashMap::default(); let mut requests = Vec::new();
for ((worktree_id, _), (lsp_adapter, language_server)) in self.language_servers.iter() { for ((worktree_id, _), (lsp_adapter, language_server)) in self.language_servers.iter() {
let worktree_id = *worktree_id;
if let Some(worktree) = self if let Some(worktree) = self
.worktree_for_id(*worktree_id, cx) .worktree_for_id(worktree_id, cx)
.and_then(|worktree| worktree.read(cx).as_local()) .and_then(|worktree| worktree.read(cx).as_local())
{ {
language_servers let lsp_adapter = lsp_adapter.clone();
.entry(Arc::as_ptr(language_server)) let worktree_abs_path = worktree.abs_path().clone();
.or_insert(( requests.push(
lsp_adapter.clone(), language_server
language_server.clone(), .request::<lsp::request::WorkspaceSymbol>(lsp::WorkspaceSymbolParams {
*worktree_id, query: query.to_string(),
worktree.abs_path().clone(), ..Default::default()
)); })
.log_err()
.map(move |response| {
(
lsp_adapter,
worktree_id,
worktree_abs_path,
response.unwrap_or_default(),
)
}),
);
} }
} }
let mut requests = Vec::new();
for (_, language_server, _, _) in language_servers.values() {
requests.push(language_server.request::<lsp::request::WorkspaceSymbol>(
lsp::WorkspaceSymbolParams {
query: query.to_string(),
..Default::default()
},
));
}
cx.spawn_weak(|this, cx| async move { cx.spawn_weak(|this, cx| async move {
let responses = futures::future::try_join_all(requests).await?; let responses = futures::future::join_all(requests).await;
let this = if let Some(this) = this.upgrade(&cx) {
this
} else {
return Ok(Default::default());
};
this.read_with(&cx, |this, cx| {
let mut symbols = Vec::new();
for (adapter, source_worktree_id, worktree_abs_path, response) in responses {
symbols.extend(response.into_iter().flatten().filter_map(|lsp_symbol| {
let abs_path = lsp_symbol.location.uri.to_file_path().ok()?;
let mut worktree_id = source_worktree_id;
let path;
if let Some((worktree, rel_path)) =
this.find_local_worktree(&abs_path, cx)
{
worktree_id = worktree.read(cx).id();
path = rel_path;
} else {
path = relativize_path(&worktree_abs_path, &abs_path);
}
let mut symbols = Vec::new(); let label = this
if let Some(this) = this.upgrade(&cx) { .languages
this.read_with(&cx, |this, cx| { .select_language(&path)
for ((adapter, _, source_worktree_id, worktree_abs_path), lsp_symbols) in .and_then(|language| {
language_servers.into_values().zip(responses) language.label_for_symbol(&lsp_symbol.name, lsp_symbol.kind)
{ })
symbols.extend(lsp_symbols.into_iter().flatten().filter_map( .unwrap_or_else(|| CodeLabel::plain(lsp_symbol.name.clone(), None));
|lsp_symbol| { let signature = this.symbol_signature(worktree_id, &path);
let abs_path = lsp_symbol.location.uri.to_file_path().ok()?;
let mut worktree_id = source_worktree_id;
let path;
if let Some((worktree, rel_path)) =
this.find_local_worktree(&abs_path, cx)
{
worktree_id = worktree.read(cx).id();
path = rel_path;
} else {
path = relativize_path(&worktree_abs_path, &abs_path);
}
let label = this Some(Symbol {
.languages source_worktree_id,
.select_language(&path) worktree_id,
.and_then(|language| { language_server_name: adapter.name(),
language name: lsp_symbol.name,
.label_for_symbol(&lsp_symbol.name, lsp_symbol.kind) kind: lsp_symbol.kind,
}) label,
.unwrap_or_else(|| { path,
CodeLabel::plain(lsp_symbol.name.clone(), None) range: range_from_lsp(lsp_symbol.location.range),
}); signature,
let signature = this.symbol_signature(worktree_id, &path); })
}));
Some(Symbol { }
source_worktree_id, Ok(symbols)
worktree_id, })
language_server_name: adapter.name(),
name: lsp_symbol.name,
kind: lsp_symbol.kind,
label,
path,
range: range_from_lsp(lsp_symbol.location.range),
signature,
})
},
));
}
})
}
Ok(symbols)
}) })
} else if let Some(project_id) = self.remote_id() { } else if let Some(project_id) = self.remote_id() {
let request = self.client.request(proto::GetProjectSymbols { let request = self.client.request(proto::GetProjectSymbols {