diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index fca3a295099..e6768ea0bc0 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -12,8 +12,8 @@ use hir_def::{
resolver::HasResolver,
type_ref::{Mutability, TypeRef},
AdtId, ConstId, DefWithBodyId, EnumId, FunctionId, HasModule, ImplId, LocalEnumVariantId,
- LocalImportId, LocalModuleId, LocalStructFieldId, Lookup, ModuleId, StaticId, StructId,
- TraitId, TypeAliasId, TypeParamId, UnionId,
+ LocalModuleId, LocalStructFieldId, Lookup, ModuleId, StaticId, StructId, TraitId, TypeAliasId,
+ TypeParamId, UnionId,
};
use hir_expand::{
diagnostics::DiagnosticSink,
@@ -180,13 +180,11 @@ impl Module {
}
/// Returns a `ModuleScope`: a set of items, visible in this module.
- pub fn scope(self, db: &impl HirDatabase) -> Vec<(Name, ScopeDef, Option<Import>)> {
+ pub fn scope(self, db: &impl HirDatabase) -> Vec<(Name, ScopeDef)> {
db.crate_def_map(self.id.krate)[self.id.local_id]
.scope
.entries()
- .map(|(name, res)| {
- (name.clone(), res.def.into(), res.import.map(|id| Import { parent: self, id }))
- })
+ .map(|(name, res)| (name.clone(), res.def.into()))
.collect()
}
@@ -229,10 +227,10 @@ impl Module {
}
}
-pub struct Import {
- pub(crate) parent: Module,
- pub(crate) id: LocalImportId,
-}
+// pub struct Import {
+// pub(crate) parent: Module,
+// pub(crate) id: LocalImportId,
+// }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct StructField {
diff --git a/crates/ra_hir/src/has_source.rs b/crates/ra_hir/src/has_source.rs
index 72afecf26c3..5541266e2b1 100644
--- a/crates/ra_hir/src/has_source.rs
+++ b/crates/ra_hir/src/has_source.rs
@@ -9,8 +9,8 @@ use hir_def::{
use ra_syntax::ast;
use crate::{
- db::DefDatabase, Const, Enum, EnumVariant, FieldSource, Function, ImplBlock, Import, MacroDef,
- Module, Static, Struct, StructField, Trait, TypeAlias, TypeParam, Union,
+ db::DefDatabase, Const, Enum, EnumVariant, FieldSource, Function, ImplBlock, MacroDef, Module,
+ Static, Struct, StructField, Trait, TypeAlias, TypeParam, Union,
};
pub use hir_expand::InFile;
@@ -117,18 +117,6 @@ impl HasSource for ImplBlock {
self.id.lookup(db).source(db)
}
}
-impl HasSource for Import {
- type Ast = Either<ast::UseTree, ast::ExternCrateItem>;
-
- /// Returns the syntax of the last path segment corresponding to this import
- fn source(self, db: &impl DefDatabase) -> InFile<Self::Ast> {
- let src = self.parent.definition_source(db);
- let (_, source_map) = db.raw_items_with_source_map(src.file_id);
- let root = db.parse_or_expand(src.file_id).unwrap();
- let ptr = source_map.get(self.id);
- src.with_value(ptr.map_left(|it| it.to_node(&root)).map_right(|it| it.to_node(&root)))
- }
-}
impl HasSource for TypeParam {
type Ast = Either<ast::TraitDef, ast::TypeParam>;
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 7f9aef77074..0008a8858fc 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -40,8 +40,8 @@ mod from_source;
pub use crate::{
code_model::{
Adt, AssocItem, AttrDef, Const, Crate, CrateDependency, DefWithBody, Docs, Enum,
- EnumVariant, FieldSource, Function, GenericDef, HasAttrs, ImplBlock, Import, Local,
- MacroDef, Module, ModuleDef, ScopeDef, Static, Struct, StructField, Trait, Type, TypeAlias,
+ EnumVariant, FieldSource, Function, GenericDef, HasAttrs, ImplBlock, Local, MacroDef,
+ Module, ModuleDef, ScopeDef, Static, Struct, StructField, Trait, Type, TypeAlias,
TypeParam, Union, VariantDef,
},
from_source::FromSource,
diff --git a/crates/ra_ide/src/completion/complete_path.rs b/crates/ra_ide/src/completion/complete_path.rs
index 28f94e0a776..8ce86ad7d21 100644
--- a/crates/ra_ide/src/completion/complete_path.rs
+++ b/crates/ra_ide/src/completion/complete_path.rs
@@ -1,7 +1,6 @@
//! FIXME: write short doc here
-use either::Either;
-use hir::{Adt, HasSource, PathResolution};
+use hir::{Adt, PathResolution, ScopeDef};
use ra_syntax::AstNode;
use test_utils::tested_by;
@@ -19,17 +18,15 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
match def {
hir::ModuleDef::Module(module) => {
let module_scope = module.scope(ctx.db);
- for (name, def, import) in module_scope {
- if let hir::ScopeDef::ModuleDef(hir::ModuleDef::BuiltinType(..)) = def {
- if ctx.use_item_syntax.is_some() {
+ for (name, def) in module_scope {
+ if ctx.use_item_syntax.is_some() {
+ if let hir::ScopeDef::ModuleDef(hir::ModuleDef::BuiltinType(..)) = def {
tested_by!(dont_complete_primitive_in_use);
continue;
}
- }
- if Some(module) == ctx.module {
- if let Some(import) = import {
- if let Either::Left(use_tree) = import.source(ctx.db).value {
- if use_tree.syntax().text_range().contains_inclusive(ctx.offset) {
+ if let ScopeDef::Unknown = def {
+ if let Some(name_ref) = ctx.name_ref.as_ref() {
+ if &name_ref.syntax().text() == name.to_string().as_str() {
// for `use self::foo<|>`, don't suggest `foo` as a completion
tested_by!(dont_complete_current_use);
continue;
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index 4894ea2f6b7..8f56ce7062a 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/crates/ra_ide/src/completion/completion_context.rs
@@ -18,6 +18,7 @@ pub(crate) struct CompletionContext<'a> {
pub(super) analyzer: hir::SourceAnalyzer,
pub(super) offset: TextUnit,
pub(super) token: SyntaxToken,
+ pub(super) name_ref: Option<ast::NameRef>,
pub(super) module: Option<hir::Module>,
pub(super) function_syntax: Option<ast::FnDef>,
pub(super) use_item_syntax: Option<ast::UseItem>,
@@ -68,6 +69,7 @@ impl<'a> CompletionContext<'a> {
analyzer,
token,
offset: position.offset,
+ name_ref: None,
module,
function_syntax: None,
use_item_syntax: None,
@@ -142,6 +144,8 @@ impl<'a> CompletionContext<'a> {
}
fn classify_name_ref(&mut self, original_file: SourceFile, name_ref: ast::NameRef) {
+ self.name_ref =
+ find_node_at_offset(original_file.syntax(), name_ref.syntax().text_range().start());
let name_range = name_ref.syntax().text_range();
if name_ref.syntax().parent().and_then(ast::RecordField::cast).is_some() {
self.record_lit_syntax = find_node_at_offset(original_file.syntax(), self.offset);