use Lazy, some fixes

4 files changed, 38 insertions, 34 deletions

diff --git a/crates/ra_ide_api/src/references/classify.rs b/crates/ra_ide_api/src/references/classify.rs
index 5cb194c0e..93e079ccc 100644
--- a/crates/ra_ide_api/src/references/classify.rs
+++ b/crates/ra_ide_api/src/references/classify.rs
@@ -1,3 +1,5 @@
+//! FIXME: write short doc here
+
 use hir::{Either, FromSource, Module, ModuleSource, Path, PathResolution, Source, SourceAnalyzer};
 use ra_db::FileId;
 use ra_syntax::{ast, match_ast, AstNode, AstPtr};
@@ -102,8 +104,9 @@ pub(crate) fn classify_name_ref(
     let analyzer = SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
 
     if let Some(method_call) = ast::MethodCallExpr::cast(parent.clone()) {
-        let func = analyzer.resolve_method_call(&method_call)?;
-        return Some(from_assoc_item(db, func.into()));
+        if let Some(func) = analyzer.resolve_method_call(&method_call) {
+            return Some(from_assoc_item(db, func.into()));
+        }
     }
 
     if let Some(field_expr) = ast::FieldExpr::cast(parent.clone()) {
@@ -128,15 +131,10 @@ pub(crate) fn classify_name_ref(
     let container = Module::from_definition(db, Source { file_id, ast })?;
     let visibility = None;
 
-    if let Some(macro_call) =
-        parent.parent().and_then(|node| node.parent()).and_then(ast::MacroCall::cast)
-    {
+    if let Some(macro_call) = parent.ancestors().find_map(ast::MacroCall::cast) {
         if let Some(macro_def) = analyzer.resolve_macro_call(db, &macro_call) {
-            return Some(NameDefinition {
-                item: NameKind::Macro(macro_def),
-                container,
-                visibility,
-            });
+            let kind = NameKind::Macro(macro_def);
+            return Some(NameDefinition { kind, container, visibility });
         }
     }
 
@@ -147,23 +145,23 @@ pub(crate) fn classify_name_ref(
         AssocItem(item) => Some(from_assoc_item(db, item)),
         LocalBinding(Either::A(pat)) => from_pat(db, file_id, pat),
         LocalBinding(Either::B(par)) => {
-            let item = NameKind::SelfParam(par);
-            Some(NameDefinition { item, container, visibility })
+            let kind = NameKind::SelfParam(par);
+            Some(NameDefinition { kind, container, visibility })
         }
         GenericParam(par) => {
             // FIXME: get generic param def
-            let item = NameKind::GenericParam(par);
-            Some(NameDefinition { item, container, visibility })
+            let kind = NameKind::GenericParam(par);
+            Some(NameDefinition { kind, container, visibility })
         }
         Macro(def) => {
-            let item = NameKind::Macro(def);
-            Some(NameDefinition { item, container, visibility })
+            let kind = NameKind::Macro(def);
+            Some(NameDefinition { kind, container, visibility })
         }
         SelfType(impl_block) => {
             let ty = impl_block.target_ty(db);
-            let item = NameKind::SelfType(ty);
+            let kind = NameKind::SelfType(ty);
             let container = impl_block.module();
-            Some(NameDefinition { item, container, visibility })
+            Some(NameDefinition { kind, container, visibility })
         }
     }
 }
diff --git a/crates/ra_ide_api/src/references/name_definition.rs b/crates/ra_ide_api/src/references/name_definition.rs
index 58baf3686..723d97237 100644
--- a/crates/ra_ide_api/src/references/name_definition.rs
+++ b/crates/ra_ide_api/src/references/name_definition.rs
@@ -1,3 +1,5 @@
+//! FIXME: write short doc here
+
 use hir::{
     db::AstDatabase, Adt, AssocItem, DefWithBody, FromSource, HasSource, HirFileId, MacroDef,
     Module, ModuleDef, StructField, Ty, VariantDef,
@@ -22,7 +24,7 @@ pub enum NameKind {
 pub(crate) struct NameDefinition {
     pub visibility: Option<ast::Visibility>,
     pub container: Module,
-    pub item: NameKind,
+    pub kind: NameKind,
 }
 
 pub(super) fn from_pat(
@@ -50,9 +52,9 @@ pub(super) fn from_pat(
             }
         }
     })?;
-    let item = NameKind::Pat((def, pat));
+    let kind = NameKind::Pat((def, pat));
     let container = def.module(db);
-    Some(NameDefinition { item, container, visibility: None })
+    Some(NameDefinition { kind, container, visibility: None })
 }
 
 pub(super) fn from_assoc_item(db: &RootDatabase, item: AssocItem) -> NameDefinition {
@@ -62,19 +64,19 @@ pub(super) fn from_assoc_item(db: &RootDatabase, item: AssocItem) -> NameDefinit
         AssocItem::Const(c) => c.source(db).ast.visibility(),
         AssocItem::TypeAlias(a) => a.source(db).ast.visibility(),
     };
-    let item = NameKind::AssocItem(item);
-    NameDefinition { item, container, visibility }
+    let kind = NameKind::AssocItem(item);
+    NameDefinition { kind, container, visibility }
 }
 
 pub(super) fn from_struct_field(db: &RootDatabase, field: StructField) -> NameDefinition {
-    let item = NameKind::Field(field);
+    let kind = NameKind::Field(field);
     let parent = field.parent_def(db);
     let container = parent.module(db);
     let visibility = match parent {
         VariantDef::Struct(s) => s.source(db).ast.visibility(),
         VariantDef::EnumVariant(e) => e.source(db).ast.parent_enum().visibility(),
     };
-    NameDefinition { item, container, visibility }
+    NameDefinition { kind, container, visibility }
 }
 
 pub(super) fn from_module_def(
@@ -82,7 +84,7 @@ pub(super) fn from_module_def(
     def: ModuleDef,
     module: Option<Module>,
 ) -> NameDefinition {
-    let item = NameKind::Def(def);
+    let kind = NameKind::Def(def);
     let (container, visibility) = match def {
         ModuleDef::Module(it) => {
             let container = it.parent(db).or_else(|| Some(it)).unwrap();
@@ -104,5 +106,5 @@ pub(super) fn from_module_def(
         ModuleDef::Adt(Adt::Enum(it)) => (it.module(db), it.source(db).ast.visibility()),
         ModuleDef::BuiltinType(..) => (module.unwrap(), None),
     };
-    NameDefinition { item, container, visibility }
+    NameDefinition { kind, container, visibility }
 }
diff --git a/crates/ra_ide_api/src/references/rename.rs b/crates/ra_ide_api/src/references/rename.rs
index 7e564a40e..c91dada46 100644
--- a/crates/ra_ide_api/src/references/rename.rs
+++ b/crates/ra_ide_api/src/references/rename.rs
@@ -1,3 +1,5 @@
+//! FIXME: write short doc here
+
 use hir::ModuleSource;
 use ra_db::SourceDatabase;
 use ra_syntax::{algo::find_node_at_offset, ast, AstNode, SyntaxNode};
diff --git a/crates/ra_ide_api/src/references/search_scope.rs b/crates/ra_ide_api/src/references/search_scope.rs
index 346815d31..aae9db13b 100644
--- a/crates/ra_ide_api/src/references/search_scope.rs
+++ b/crates/ra_ide_api/src/references/search_scope.rs
@@ -1,3 +1,5 @@
+//! FIXME: write short doc here
+
 use hir::{DefWithBody, HasSource, ModuleSource};
 use ra_db::{FileId, SourceDatabase};
 use ra_syntax::{AstNode, TextRange};
@@ -7,21 +9,21 @@ use crate::db::RootDatabase;
 use super::{NameDefinition, NameKind};
 
 pub(crate) struct SearchScope {
-    pub scope: Vec<(FileId, Option<TextRange>)>,
+    pub files: Vec<(FileId, Option<TextRange>)>,
 }
 
 impl NameDefinition {
-    pub fn scope(&self, db: &RootDatabase) -> SearchScope {
+    pub(crate) fn scope(&self, db: &RootDatabase) -> SearchScope {
         let module_src = self.container.definition_source(db);
         let file_id = module_src.file_id.original_file(db);
 
-        if let NameKind::Pat((def, _)) = self.item {
+        if let NameKind::Pat((def, _)) = self.kind {
             let range = match def {
                 DefWithBody::Function(f) => f.source(db).ast.syntax().text_range(),
                 DefWithBody::Const(c) => c.source(db).ast.syntax().text_range(),
                 DefWithBody::Static(s) => s.source(db).ast.syntax().text_range(),
             };
-            return SearchScope { scope: vec![(file_id, Some(range))] };
+            return SearchScope { files: vec![(file_id, Some(range))] };
         }
 
         if let Some(ref vis) = self.visibility {
@@ -30,7 +32,7 @@ impl NameDefinition {
             let mut files = source_root.walk().map(|id| (id.into(), None)).collect::<Vec<_>>();
 
             if vis.syntax().to_string().as_str() == "pub(crate)" {
-                return SearchScope { scope: files };
+                return SearchScope { files };
             }
             if vis.syntax().to_string().as_str() == "pub" {
                 let krate = self.container.krate(db).unwrap();
@@ -47,7 +49,7 @@ impl NameDefinition {
                     }
                 }
 
-                return SearchScope { scope: files };
+                return SearchScope { files };
             }
             // FIXME: "pub(super)", "pub(in path)"
         }
@@ -56,6 +58,6 @@ impl NameDefinition {
             ModuleSource::Module(m) => Some(m.syntax().text_range()),
             ModuleSource::SourceFile(_) => None,
         };
-        SearchScope { scope: vec![(file_id, range)] }
+        SearchScope { files: vec![(file_id, range)] }
     }
 }