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

use completions in API

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-21 15:50:07 +03:00
parent ba0072401c
commit d4ef07b235
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_analysis/src/completion.rs
View file

@ -24,7 +24,7 @@ pub use crate::completion::completion_item::{CompletionItem, InsertText};
pub(crate) fn completions(
db: &db::RootDatabase,
position: FilePosition,
) -> Cancelable<Option<Vec<CompletionItem>>> {
) -> Cancelable<Option<Completions>> {
let original_file = db.source_file(position.file_id);
// Insert a fake ident to get a valid parse tree
let file = {
@ -53,12 +53,10 @@ pub(crate) fn completions(
param_completions(&mut acc, name.syntax());
}
}
let res = if has_completions {
Some(acc.into())
} else {
None
};
Ok(res)
if !has_completions {
return Ok(None);
}
Ok(Some(acc))
}
/// Complete repeated parametes, both name and type. For example, if all