mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't overflow when limiting symbol search

Browse Source
This commit is contained in:
Aleksey Kladov 2018-09-08 15:39:28 +03:00
parent 7daaddb2ac
commit df05c5c3e2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/libanalysis/src/symbol_index.rs
View File

@ -42,7 +42,7 @@ pub(crate) fn for_file(file_id: FileId, file: File) -> SymbolIndex {
impl Query {
pub(crate) fn search(
mut self,
self,
indices: &[&SymbolIndex],
token: &JobToken,
) -> Vec<(FileId, FileSymbol)> {
@ -55,7 +55,7 @@ pub(crate) fn search(
let mut stream = op.union();
let mut res = Vec::new();
while let Some((_, indexed_values)) = stream.next() {
if self.limit == 0 || token.is_canceled() {
if res.len() >= self.limit || token.is_canceled() {
break;
}
for indexed_value in indexed_values {
@ -70,7 +70,6 @@ pub(crate) fn search(
continue;
}
res.push((*file_id, symbol.clone()));
self.limit -= 1;
}
}
res