From dfbe96750b69fc69e64f3a6094e2c1d574ab42fa Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 6 Feb 2020 16:26:43 +0100
Subject: [PATCH] Move imports locator to ide_db

---
 crates/ra_ide/src/assists.rs                     |  4 ++--
 crates/ra_ide/src/lib.rs                         |  1 -
 .../{ra_ide => ra_ide_db}/src/imports_locator.rs | 16 ++++++++--------
 crates/ra_ide_db/src/lib.rs                      |  1 +
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename crates/{ra_ide => ra_ide_db}/src/imports_locator.rs (92%)

diff --git a/crates/ra_ide/src/assists.rs b/crates/ra_ide/src/assists.rs
index f26047570f3..4a7d8cfa95a 100644
--- a/crates/ra_ide/src/assists.rs
+++ b/crates/ra_ide/src/assists.rs
@@ -3,9 +3,9 @@
 use either::Either;
 use ra_assists::{AssistAction, AssistLabel};
 use ra_db::{FilePosition, FileRange};
-use ra_ide_db::RootDatabase;
+use ra_ide_db::{imports_locator::ImportsLocatorIde, RootDatabase};
 
-use crate::{imports_locator::ImportsLocatorIde, FileId, SourceChange, SourceFileEdit};
+use crate::{FileId, SourceChange, SourceFileEdit};
 
 pub use ra_assists::AssistId;
 
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index 5fb111a90d9..689921f3f23 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -26,7 +26,6 @@
 mod parent_module;
 mod references;
 mod impls;
-mod imports_locator;
 mod assists;
 mod diagnostics;
 mod syntax_tree;
diff --git a/crates/ra_ide/src/imports_locator.rs b/crates/ra_ide_db/src/imports_locator.rs
similarity index 92%
rename from crates/ra_ide/src/imports_locator.rs
rename to crates/ra_ide_db/src/imports_locator.rs
index 0dca0c86c2b..21e63760856 100644
--- a/crates/ra_ide/src/imports_locator.rs
+++ b/crates/ra_ide_db/src/imports_locator.rs
@@ -3,22 +3,22 @@
 
 use hir::{db::HirDatabase, ModuleDef, SourceBinder};
 use ra_assists::ImportsLocator;
-use ra_ide_db::{
-    defs::NameKind,
-    symbol_index::{self, FileSymbol},
-    RootDatabase,
-};
 use ra_prof::profile;
 use ra_syntax::{ast, AstNode, SyntaxKind::NAME};
 
-use crate::{references::classify_name, Query};
+use crate::{
+    defs::classify_name,
+    defs::NameKind,
+    symbol_index::{self, FileSymbol, Query},
+    RootDatabase,
+};
 
-pub(crate) struct ImportsLocatorIde<'a> {
+pub struct ImportsLocatorIde<'a> {
     source_binder: SourceBinder<'a, RootDatabase>,
 }
 
 impl<'a> ImportsLocatorIde<'a> {
-    pub(crate) fn new(db: &'a RootDatabase) -> Self {
+    pub fn new(db: &'a RootDatabase) -> Self {
         Self { source_binder: SourceBinder::new(db) }
     }
 
diff --git a/crates/ra_ide_db/src/lib.rs b/crates/ra_ide_db/src/lib.rs
index 0715dfc66bf..877ac3c38e3 100644
--- a/crates/ra_ide_db/src/lib.rs
+++ b/crates/ra_ide_db/src/lib.rs
@@ -8,6 +8,7 @@
 pub mod symbol_index;
 pub mod change;
 pub mod defs;
+pub mod imports_locator;
 mod wasm_shims;
 
 use std::sync::Arc;
-- 
2.44.0