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

completion uses hir scopes

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-22 11:01:03 +03:00
parent 4e4ca27eab
commit 49e746b010
5 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

44
crates/ra_analysis/src/completion/complete_scope.rs
View file

@ -10,32 +10,34 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) ->
if !ctx.is_trivial_path {
return Ok(());
}
let module = match &ctx.module {
Some(it) => it,
None => return Ok(()),
};
if let Some(fn_def) = ctx.enclosing_fn {
let scopes = hir::FnScopes::new(fn_def);
let function = hir::source_binder::function_from_module(ctx.db, module, fn_def);
let scopes = function.scopes(ctx.db);
complete_fn(acc, &scopes, ctx.offset);
}
if let Some(module) = &ctx.module {
let module_scope = module.scope(ctx.db)?;
module_scope
.entries()
.filter(|(_name, res)| {
// Don't expose this item
match res.import {
None => true,
Some(import) => {
let range = import.range(ctx.db, module.source().file_id());
!range.is_subrange(&ctx.leaf.range())
}
let module_scope = module.scope(ctx.db)?;
module_scope
.entries()
.filter(|(_name, res)| {
// Don't expose this item
match res.import {
None => true,
Some(import) => {
let range = import.range(ctx.db, module.source().file_id());
!range.is_subrange(&ctx.leaf.range())
}
})
.for_each(|(name, res)| {
CompletionItem::new(CompletionKind::Reference, name.to_string())
.from_resolution(ctx.db, res)
.add_to(acc)
});
}
}
})
.for_each(|(name, res)| {
CompletionItem::new(CompletionKind::Reference, name.to_string())
.from_resolution(ctx.db, res)
.add_to(acc)
});
Ok(())
}

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

@ -235,7 +235,7 @@ impl AnalysisImpl {
position.file_id,
name_ref.syntax(),
)? {
let scope = fn_descr.scope(&*self.db);
let scope = fn_descr.scopes(&*self.db);
// First try to resolve the symbol locally
if let Some(entry) = scope.resolve_local_name(name_ref) {
rr.add_resolution(
@ -294,7 +294,7 @@ impl AnalysisImpl {
let mut ret = vec![(position.file_id, binding.syntax().range())];
ret.extend(
descr
.scope(&*self.db)
.scopes(&*self.db)
.find_all_refs(binding)
.into_iter()
.map(|ref_desc| (position.file_id, ref_desc.range)),
@ -322,7 +322,7 @@ impl AnalysisImpl {
position.file_id,
name_ref.syntax(),
)?);
let scope = descr.scope(db);
let scope = descr.scopes(db);
let resolved = ctry!(scope.resolve_local_name(name_ref));
let resolved = resolved.ptr().resolve(source_file);
let binding = ctry!(find_node_at_offset::<ast::BindPat>(