From d0a782ef1c53ef5c5d3b49b02c498f7a688c3a4d Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Fri, 24 Jan 2020 09:33:18 +0200
Subject: Have a better trait interface

---
 crates/ra_ide/src/imports_locator.rs | 70 +++++++++++++-----------------------
 1 file changed, 24 insertions(+), 46 deletions(-)

(limited to 'crates/ra_ide')

diff --git a/crates/ra_ide/src/imports_locator.rs b/crates/ra_ide/src/imports_locator.rs
index e69fb4070..b2fc48159 100644
--- a/crates/ra_ide/src/imports_locator.rs
+++ b/crates/ra_ide/src/imports_locator.rs
@@ -3,13 +3,11 @@
 
 use crate::{
     db::RootDatabase,
-    references::{classify_name, classify_name_ref, NameDefinition, NameKind},
+    references::{classify_name, NameDefinition, NameKind},
     symbol_index::{self, FileSymbol},
     Query,
 };
-use ast::NameRef;
-use hir::{db::HirDatabase, InFile, ModPath, Module, SourceBinder};
-use itertools::Itertools;
+use hir::{db::HirDatabase, ModuleDef, SourceBinder};
 use ra_assists::ImportsLocator;
 use ra_prof::profile;
 use ra_syntax::{ast, AstNode, SyntaxKind::NAME};
@@ -23,14 +21,30 @@ impl<'a> ImportsLocatorIde<'a> {
         Self { source_binder: SourceBinder::new(db) }
     }
 
-    fn search_for_imports(
+    fn get_name_definition(
         &mut self,
-        name_to_import: &ast::NameRef,
-        module_with_name_to_import: Module,
-    ) -> Vec<ModPath> {
+        db: &impl HirDatabase,
+        import_candidate: &FileSymbol,
+    ) -> Option<NameDefinition> {
+        let _p = profile("get_name_definition");
+        let file_id = import_candidate.file_id.into();
+        let candidate_node = import_candidate.ptr.to_node(&db.parse_or_expand(file_id)?);
+        let candidate_name_node = if candidate_node.kind() != NAME {
+            candidate_node.children().find(|it| it.kind() == NAME)?
+        } else {
+            candidate_node
+        };
+        classify_name(
+            &mut self.source_binder,
+            hir::InFile { file_id, value: &ast::Name::cast(candidate_name_node)? },
+        )
+    }
+}
+
+impl<'a> ImportsLocator for ImportsLocatorIde<'a> {
+    fn find_imports(&mut self, name_to_import: &str) -> Vec<ModuleDef> {
         let _p = profile("search_for_imports");
         let db = self.source_binder.db;
-        let name_to_import = name_to_import.text();
 
         let project_results = {
             let mut query = Query::new(name_to_import.to_string());
@@ -52,47 +66,11 @@ impl<'a> ImportsLocatorIde<'a> {
             .filter_map(|import_candidate| self.get_name_definition(db, &import_candidate))
             .filter_map(|name_definition_to_import| {
                 if let NameKind::Def(module_def) = name_definition_to_import.kind {
-                    module_with_name_to_import.find_use_path(db, module_def)
+                    Some(module_def)
                 } else {
                     None
                 }
             })
-            .filter(|use_path| !use_path.segments.is_empty())
-            .unique()
-            .take(20)
             .collect()
     }
-
-    fn get_name_definition(
-        &mut self,
-        db: &impl HirDatabase,
-        import_candidate: &FileSymbol,
-    ) -> Option<NameDefinition> {
-        let _p = profile("get_name_definition");
-        let file_id = import_candidate.file_id.into();
-        let candidate_node = import_candidate.ptr.to_node(&db.parse_or_expand(file_id)?);
-        let candidate_name_node = if candidate_node.kind() != NAME {
-            candidate_node.children().find(|it| it.kind() == NAME)?
-        } else {
-            candidate_node
-        };
-        classify_name(
-            &mut self.source_binder,
-            hir::InFile { file_id, value: &ast::Name::cast(candidate_name_node)? },
-        )
-    }
-}
-
-impl<'a> ImportsLocator for ImportsLocatorIde<'a> {
-    fn find_imports(
-        &mut self,
-        name_to_import: InFile<&NameRef>,
-        module_with_name_to_import: Module,
-    ) -> Option<Vec<ModPath>> {
-        if classify_name_ref(&mut self.source_binder, name_to_import).is_none() {
-            Some(self.search_for_imports(name_to_import.value, module_with_name_to_import))
-        } else {
-            None
-        }
-    }
 }
-- 
cgit v1.2.3