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

Remove some usages of Completions::add_resolution

Browse source
This commit is contained in:
Lukas Wirth 2022-06-20 14:47:30 +02:00
parent 7685245282
commit 90483321ee
6 changed files with 62 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

39
crates/ide-completion/src/completions.rs
View file

@ -22,7 +22,7 @@ pub(crate) mod vis;
use std::iter;
use hir::{db::HirDatabase, known, ScopeDef};
use hir::{known, ScopeDef};
use ide_db::SymbolKind;
use syntax::ast;
@ -46,22 +46,6 @@ use crate::{
CompletionContext, CompletionItem, CompletionItemKind,
};
fn module_or_attr(db: &dyn HirDatabase, def: ScopeDef) -> Option<ScopeDef> {
match def {
ScopeDef::ModuleDef(hir::ModuleDef::Macro(m)) if m.is_attr(db) => Some(def),
ScopeDef::ModuleDef(hir::ModuleDef::Module(_)) => Some(def),
_ => None,
}
}
fn module_or_fn_macro(db: &dyn HirDatabase, def: ScopeDef) -> Option<ScopeDef> {
match def {
ScopeDef::ModuleDef(hir::ModuleDef::Macro(m)) if m.is_fn_like(db) => Some(def),
ScopeDef::ModuleDef(hir::ModuleDef::Module(_)) => Some(def),
_ => None,
}
}
/// Represents an in-progress set of completions being built.
#[derive(Debug, Default)]
pub struct Completions {
@ -184,6 +168,15 @@ impl Completions {
self.add(render_resolution_simple(RenderContext::new(ctx), local_name, resolution).build());
}
pub(crate) fn add_module(
&mut self,
ctx: &CompletionContext,
module: hir::Module,
local_name: hir::Name,
) {
self.add_resolution(ctx, local_name, hir::ScopeDef::ModuleDef(module.into()));
}
pub(crate) fn add_macro(
&mut self,
ctx: &CompletionContext,
@ -486,16 +479,19 @@ pub(super) fn complete_name_ref(
match kind {
NameRefKind::Path(path_ctx) => {
flyimport::import_on_the_fly_path(acc, ctx, path_ctx);
match &path_ctx.kind {
PathKind::Expr { expr_ctx } => {
dot::complete_undotted_self(acc, ctx, path_ctx, expr_ctx);
expr::complete_expr_path(acc, ctx, path_ctx, expr_ctx);
dot::complete_undotted_self(acc, ctx, path_ctx, expr_ctx);
item_list::complete_item_list_in_expr(acc, ctx, path_ctx, expr_ctx);
record::complete_record_expr_func_update(acc, ctx, path_ctx, expr_ctx);
snippet::complete_expr_snippet(acc, ctx, path_ctx, expr_ctx);
}
PathKind::Type { location } => {
r#type::complete_type_path(acc, ctx, path_ctx, location);
match location {
TypeLocation::TupleField => {
field::complete_field_list_tuple_variant(acc, ctx, path_ctx);
@ -511,13 +507,14 @@ pub(super) fn complete_name_ref(
}
}
PathKind::Attr { attr_ctx } => {
attribute::complete_attribute(acc, ctx, path_ctx, attr_ctx);
attribute::complete_attribute_path(acc, ctx, path_ctx, attr_ctx);
}
PathKind::Derive { existing_derives } => {
attribute::complete_derive(acc, ctx, path_ctx, existing_derives);
attribute::complete_derive_path(acc, ctx, path_ctx, existing_derives);
}
PathKind::Item { kind } => {
item_list::complete_item_list(acc, ctx, path_ctx, kind);
snippet::complete_item_snippet(acc, ctx, path_ctx, kind);
if let ItemListKind::TraitImpl(impl_) = kind {
item_list::trait_impl::complete_trait_impl_item_by_name(
@ -532,7 +529,7 @@ pub(super) fn complete_name_ref(
vis::complete_vis_path(acc, ctx, path_ctx, has_in_token);
}
PathKind::Use => {
use_::complete_use_tree(acc, ctx, path_ctx, nameref);
use_::complete_use_path(acc, ctx, path_ctx, nameref);
}
}
}