move index_resolve to symbol index

4 files changed, 11 insertions, 14 deletions

diff --git a/crates/ra_ide_api/src/call_info.rs b/crates/ra_ide_api/src/call_info.rs
index 2eb388e0e..a59ab7853 100644
--- a/crates/ra_ide_api/src/call_info.rs
+++ b/crates/ra_ide_api/src/call_info.rs
@@ -20,7 +20,7 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
     let name_ref = calling_node.name_ref()?;
 
     // Resolve the function's NameRef (NOTE: this isn't entirely accurate).
-    let file_symbols = db.index_resolve(name_ref);
+    let file_symbols = crate::symbol_index::index_resolve(db, name_ref);
     let symbol = file_symbols
         .into_iter()
         .find(|it| it.ptr.kind() == FN_DEF)?;
diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs
index 681f36623..69f2d2bf6 100644
--- a/crates/ra_ide_api/src/goto_definition.rs
+++ b/crates/ra_ide_api/src/goto_definition.rs
@@ -118,8 +118,7 @@ pub(crate) fn reference_definition(
         }
     }
     // If that fails try the index based approach.
-    let navs = db
-        .index_resolve(name_ref)
+    let navs = crate::symbol_index::index_resolve(db, name_ref)
         .into_iter()
         .map(NavigationTarget::from_symbol)
         .collect();
diff --git a/crates/ra_ide_api/src/imp.rs b/crates/ra_ide_api/src/imp.rs
index 435cc7d4b..a351c9373 100644
--- a/crates/ra_ide_api/src/imp.rs
+++ b/crates/ra_ide_api/src/imp.rs
@@ -2,13 +2,11 @@ use hir::{
     self, Problem, source_binder
 };
 use ra_ide_api_light::{self, LocalEdit, Severity};
-use ra_syntax::ast;
 use ra_db::SourceDatabase;
 
 use crate::{
     db, Diagnostic, FileId, FilePosition, FileSystemEdit,
-    Query, SourceChange, SourceFileEdit,
-    symbol_index::FileSymbol,
+    SourceChange, SourceFileEdit,
 };
 
 impl db::RootDatabase {
@@ -75,14 +73,6 @@ impl db::RootDatabase {
         };
         res
     }
-
-    pub(crate) fn index_resolve(&self, name_ref: &ast::NameRef) -> Vec<FileSymbol> {
-        let name = name_ref.text();
-        let mut query = Query::new(name.to_string());
-        query.exact();
-        query.limit(4);
-        crate::symbol_index::world_symbols(self, query)
-    }
 }
 
 impl SourceChange {
diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs
index 9f939c650..3d0b2369e 100644
--- a/crates/ra_ide_api/src/symbol_index.rs
+++ b/crates/ra_ide_api/src/symbol_index.rs
@@ -109,6 +109,14 @@ pub(crate) fn world_symbols(db: &RootDatabase, query: Query) -> Vec<FileSymbol>
     query.search(&buf)
 }
 
+pub(crate) fn index_resolve(db: &RootDatabase, name_ref: &ast::NameRef) -> Vec<FileSymbol> {
+    let name = name_ref.text();
+    let mut query = Query::new(name.to_string());
+    query.exact();
+    query.limit(4);
+    crate::symbol_index::world_symbols(db, query)
+}
+
 #[derive(Default, Debug)]
 pub(crate) struct SymbolIndex {
     symbols: Vec<FileSymbol>,