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

reorganize completion

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-07 19:49:49 +03:00
parent 22949dab26
commit af17fc9697
2 changed files with 75 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ra_analysis/src/imp.rs
View file

@ -17,7 +17,7 @@ use rustc_hash::FxHashSet;
use salsa::{Database, ParallelDatabase};
use crate::{
completion::{resolve_based_completion, scope_completion, CompletionItem},
completion::{completions, CompletionItem},
db::{self, FileSyntaxQuery, SyntaxDatabase},
descriptors::{
function::{FnDescriptor, FnId},
@ -267,18 +267,7 @@ impl AnalysisImpl {
self.db.crate_graph().crate_roots[&crate_id]
}
pub fn completions(&self, position: FilePosition) -> Cancelable<Option<Vec<CompletionItem>>> {
let mut res = Vec::new();
let mut has_completions = false;
if let Some(scope_based) = scope_completion(&self.db, position) {
res.extend(scope_based);
has_completions = true;
}
if let Some(scope_based) = resolve_based_completion(&self.db, position)? {
res.extend(scope_based);
has_completions = true;
}
let res = if has_completions { Some(res) } else { None };
Ok(res)
completions(&self.db, position)
}
pub fn approximately_resolve_symbol(
&self,