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

Generalize query

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-13 16:07:05 +03:00
parent 0568e76406
commit 7fc91f41d8
5 changed files with 79 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,8 @@ use std::{
use libsyntax2::ast;
use libeditor::{LineIndex, FileSymbol};
use self::symbol_index::{FileSymbols, Query};
use self::symbol_index::{FileSymbols};
pub use self::symbol_index::Query;
pub type Result<T> = ::std::result::Result<T, ::failure::Error>;
@ -89,14 +90,13 @@ impl World {
Ok(index.clone())
}
pub fn world_symbols<'a>(&'a self, query: &str) -> impl Iterator<Item=(&'a Path, &'a FileSymbol)> + 'a
pub fn world_symbols<'a>(&'a self, query: Query) -> impl Iterator<Item=(&'a Path, &'a FileSymbol)> + 'a
{
let q = Query::new(query);
self.data.file_map.iter()
.flat_map(move |(path, data)| {
let path: &'a Path = path.as_path();
let symbols = data.symbols(path);
q.process(symbols).map(move |s| (path, s))
query.process(symbols).map(move |s| (path, s))
})
}