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

scope-based copmletions on original file

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-22 00:52:02 +03:00
parent 2136e75c0b
commit ccca5aae43
5 changed files with 223 additions and 322 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,10 @@
mod completion_item;
mod reference_completion;
mod complete_fn_param;
mod complete_keyword;
mod complete_snippet;
mod complete_path;
mod complete_scope;
use ra_editor::find_node_at_offset;
use ra_text_edit::AtomTextEdit;
@ -33,26 +33,16 @@ pub(crate) fn completions(
position: FilePosition,
) -> Cancelable<Option<Completions>> {
let original_file = db.source_file(position.file_id);
// Insert a fake ident to get a valid parse tree
let file = {
let edit = AtomTextEdit::insert(position.offset, "intellijRulezz".to_string());
original_file.reparse(&edit)
};
let module = ctry!(source_binder::module_from_position(db, position)?);
let ctx = ctry!(SyntaxContext::new(db, &original_file, position)?);
let mut acc = Completions::default();
// First, let's try to complete a reference to some declaration.
if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(file.syntax(), position.offset) {
reference_completion::completions(&mut acc, db, &module, &file, name_ref)?;
}
let ctx = ctry!(SyntaxContext::new(db, &original_file, position)?);
complete_fn_param::complete_fn_param(&mut acc, &ctx);
complete_keyword::complete_expr_keyword(&mut acc, &ctx);
complete_snippet::complete_expr_snippet(&mut acc, &ctx);
complete_snippet::complete_item_snippet(&mut acc, &ctx);
complete_path::complete_path(&mut acc, &ctx)?;
complete_scope::complete_scope(&mut acc, &ctx)?;
Ok(Some(acc))
}
@ -62,6 +52,7 @@ pub(crate) fn completions(
#[derive(Debug)]
pub(super) struct SyntaxContext<'a> {
db: &'a db::RootDatabase,
offset: TextUnit,
leaf: SyntaxNodeRef<'a>,
module: Option<hir::Module>,
enclosing_fn: Option<ast::FnDef<'a>>,
@ -88,6 +79,7 @@ impl<'a> SyntaxContext<'a> {
let mut ctx = SyntaxContext {
db,
leaf,
offset: position.offset,
module,
enclosing_fn: None,
is_param: false,