aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/ra_ide/src/assists.rs4
-rw-r--r--crates/ra_ide/src/lib.rs1
-rw-r--r--crates/ra_ide_db/src/imports_locator.rs (renamed from crates/ra_ide/src/imports_locator.rs)16
-rw-r--r--crates/ra_ide_db/src/lib.rs1
4 files changed, 11 insertions, 11 deletions
diff --git a/crates/ra_ide/src/assists.rs b/crates/ra_ide/src/assists.rs
index f26047570..4a7d8cfa9 100644
--- a/crates/ra_ide/src/assists.rs
+++ b/crates/ra_ide/src/assists.rs
@@ -3,9 +3,9 @@
3use either::Either; 3use either::Either;
4use ra_assists::{AssistAction, AssistLabel}; 4use ra_assists::{AssistAction, AssistLabel};
5use ra_db::{FilePosition, FileRange}; 5use ra_db::{FilePosition, FileRange};
6use ra_ide_db::RootDatabase; 6use ra_ide_db::{imports_locator::ImportsLocatorIde, RootDatabase};
7 7
8use crate::{imports_locator::ImportsLocatorIde, FileId, SourceChange, SourceFileEdit}; 8use crate::{FileId, SourceChange, SourceFileEdit};
9 9
10pub use ra_assists::AssistId; 10pub use ra_assists::AssistId;
11 11
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index 5fb111a90..689921f3f 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -26,7 +26,6 @@ mod syntax_highlighting;
26mod parent_module; 26mod parent_module;
27mod references; 27mod references;
28mod impls; 28mod impls;
29mod imports_locator;
30mod assists; 29mod assists;
31mod diagnostics; 30mod diagnostics;
32mod syntax_tree; 31mod syntax_tree;
diff --git a/crates/ra_ide/src/imports_locator.rs b/crates/ra_ide_db/src/imports_locator.rs
index 0dca0c86c..21e637608 100644
--- a/crates/ra_ide/src/imports_locator.rs
+++ b/crates/ra_ide_db/src/imports_locator.rs
@@ -3,22 +3,22 @@
3 3
4use hir::{db::HirDatabase, ModuleDef, SourceBinder}; 4use hir::{db::HirDatabase, ModuleDef, SourceBinder};
5use ra_assists::ImportsLocator; 5use ra_assists::ImportsLocator;
6use ra_ide_db::{
7 defs::NameKind,
8 symbol_index::{self, FileSymbol},
9 RootDatabase,
10};
11use ra_prof::profile; 6use ra_prof::profile;
12use ra_syntax::{ast, AstNode, SyntaxKind::NAME}; 7use ra_syntax::{ast, AstNode, SyntaxKind::NAME};
13 8
14use crate::{references::classify_name, Query}; 9use crate::{
10 defs::classify_name,
11 defs::NameKind,
12 symbol_index::{self, FileSymbol, Query},
13 RootDatabase,
14};
15 15
16pub(crate) struct ImportsLocatorIde<'a> { 16pub struct ImportsLocatorIde<'a> {
17 source_binder: SourceBinder<'a, RootDatabase>, 17 source_binder: SourceBinder<'a, RootDatabase>,
18} 18}
19 19
20impl<'a> ImportsLocatorIde<'a> { 20impl<'a> ImportsLocatorIde<'a> {
21 pub(crate) fn new(db: &'a RootDatabase) -> Self { 21 pub fn new(db: &'a RootDatabase) -> Self {
22 Self { source_binder: SourceBinder::new(db) } 22 Self { source_binder: SourceBinder::new(db) }
23 } 23 }
24 24
diff --git a/crates/ra_ide_db/src/lib.rs b/crates/ra_ide_db/src/lib.rs
index 0715dfc66..877ac3c38 100644
--- a/crates/ra_ide_db/src/lib.rs
+++ b/crates/ra_ide_db/src/lib.rs
@@ -8,6 +8,7 @@ pub mod feature_flags;
8pub mod symbol_index; 8pub mod symbol_index;
9pub mod change; 9pub mod change;
10pub mod defs; 10pub mod defs;
11pub mod imports_locator;
11mod wasm_shims; 12mod wasm_shims;
12 13
13use std::sync::Arc; 14use std::sync::Arc;