language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 22:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make resolve_path cancelable

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-27 16:30:02 +03:00
parent 6bb06addf8
commit 5b0e347f89
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_analysis/src/completion/reference_completion.rs
View file

@ -157,7 +157,7 @@ fn complete_path(
return Ok(()); return Ok(());
} }
path.segments.pop(); path.segments.pop();
let target_module = match module.resolve_path(path) { let target_module = match module.resolve_path(path)? {
None => return Ok(()), None => return Ok(()),
Some(it) => it, Some(it) => it,
}; };

10
crates/ra_analysis/src/descriptors/module/mod.rs
View file

@ -133,7 +133,15 @@ impl ModuleDescriptor {
Ok(res) Ok(res)
} }
pub(crate) fn resolve_path(&self, path: Path) -> Option<ModuleDescriptor> { pub(crate) fn resolve_path(&self, path: Path) -> Cancelable<Option<ModuleDescriptor>> {
let res = match self.do_resolve_path(path) {
None => return Ok(None),
Some(it) => it,
};
Ok(Some(res))
}
fn do_resolve_path(&self, path: Path) -> Option<ModuleDescriptor> {
let mut curr = match path.kind { let mut curr = match path.kind {
PathKind::Crate => self.crate_root(), PathKind::Crate => self.crate_root(),
PathKind::Self_ | PathKind::Plain => self.clone(), PathKind::Self_ | PathKind::Plain => self.clone(),