language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Better limiting

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-13 17:19:27 +03:00
parent 8ae56fa6d0
commit 5a56ac4b72
3 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/libanalysis/src/lib.rs
View file

@ -94,12 +94,12 @@ impl World {
Ok(index.clone())
}
pub fn world_symbols<'a>(&'a self, query: Query) -> impl Iterator<Item=(&'a Path, &'a FileSymbol)> + 'a {
pub fn world_symbols<'a>(&'a self, mut query: Query) -> impl Iterator<Item=(&'a Path, &'a FileSymbol)> + 'a {
self.data.file_map.iter()
.flat_map(move |(path, data)| {
let path: &'a Path = path.as_path();
let symbols = data.symbols(path);
query.process(symbols).map(move |s| (path, s))
let symbols = data.symbols();
query.process(symbols).into_iter().map(move |s| (path, s))
})
}
@ -125,7 +125,8 @@ impl World {
let mut query = Query::new(name.to_string());
query.exact();
Ok(self.world_symbols(query).take(4).collect())
query.limit(4);
Ok(self.world_symbols(query).collect())
}
fn file_data(&self, path: &Path) -> Result<Arc<FileData>> {
@ -178,9 +179,14 @@ impl FileData {
})
}
fn symbols(&self, path: &Path) -> &FileSymbols {
let syntax = self.syntax(path);
fn syntax_transient(&self) -> ast::File {
self.syntax.get().map(|s| s.clone())
.unwrap_or_else(|| ast::File::parse(&self.text))
}
fn symbols(&self) -> &FileSymbols {
let syntax = self.syntax_transient();
self.symbols
.get_or_init(|| FileSymbols::new(syntax))
.get_or_init(|| FileSymbols::new(&syntax))
}
}