kill approximatelly_resolve_symbol

crates/ra_analysis/src/goto_defenition.rs

@@ -20,7 +20,7 @@ pub(crate) fn goto_defenition(
     Ok(None)
 }
 
-fn reference_defenition(
+pub(crate) fn reference_defenition(
     db: &RootDatabase,
     file_id: FileId,
     name_ref: ast::NameRef,

crates/ra_analysis/src/hover.rs

@@ -1,4 +1,5 @@
 use ra_db::{Cancelable, SyntaxDatabase};
+use ra_editor::find_node_at_offset;
 use ra_syntax::{
     AstNode, SyntaxNode,
     ast::{self, NameOwner},
@@ -11,18 +12,18 @@ pub(crate) fn hover(
     db: &RootDatabase,
     position: FilePosition,
 ) -> Cancelable<Option<RangeInfo<String>>> {
+    let file = db.source_file(position.file_id);
     let mut res = Vec::new();
-    let range = if let Some(rr) = db.approximately_resolve_symbol(position)? {
+    let range = if let Some(name_ref) =
-        for nav in rr.resolves_to {
+        find_node_at_offset::<ast::NameRef>(file.syntax(), position.offset)
+    {
+        let navs = crate::goto_defenition::reference_defenition(db, position.file_id, name_ref)?;
+        for nav in navs {
             res.extend(doc_text_for(db, nav)?)
         }
-        rr.reference_range
+        name_ref.syntax().range()
     } else {
-        let file = db.source_file(position.file_id);
+        let expr: ast::Expr = ctry!(find_node_at_offset(file.syntax(), position.offset));
-        let expr: ast::Expr = ctry!(ra_editor::find_node_at_offset(
-            file.syntax(),
-            position.offset
-        ));
         let frange = FileRange {
             file_id: position.file_id,
             range: expr.syntax().range(),

crates/ra_analysis/src/imp.rs

@@ -18,7 +18,7 @@ use crate::{
     AnalysisChange,
     Cancelable, NavigationTarget,
     CrateId, db, Diagnostic, FileId, FilePosition, FileRange, FileSystemEdit,
-    Query, ReferenceResolution, RootChange, SourceChange, SourceFileEdit,
+    Query, RootChange, SourceChange, SourceFileEdit,
     symbol_index::{LibrarySymbolsQuery, FileSymbol},
 };
 
@@ -139,66 +139,6 @@ impl db::RootDatabase {
     pub(crate) fn crate_root(&self, crate_id: CrateId) -> FileId {
         self.crate_graph().crate_root(crate_id)
     }
-    pub(crate) fn approximately_resolve_symbol(
-        &self,
-        position: FilePosition,
-    ) -> Cancelable<Option<ReferenceResolution>> {
-        let file = self.source_file(position.file_id);
-        let syntax = file.syntax();
-        if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(syntax, position.offset) {
-            let mut rr = ReferenceResolution::new(name_ref.syntax().range());
-            if let Some(fn_descr) =
-                source_binder::function_from_child_node(self, position.file_id, name_ref.syntax())?
-            {
-                let scope = fn_descr.scopes(self);
-                // First try to resolve the symbol locally
-                if let Some(entry) = scope.resolve_local_name(name_ref) {
-                    rr.resolves_to.push(NavigationTarget {
-                        file_id: position.file_id,
-                        name: entry.name().to_string().into(),
-                        range: entry.ptr().range(),
-                        kind: NAME,
-                        ptr: None,
-                    });
-                    return Ok(Some(rr));
-                };
-            }
-            // If that fails try the index based approach.
-            rr.resolves_to.extend(
-                self.index_resolve(name_ref)?
-                    .into_iter()
-                    .map(NavigationTarget::from_symbol),
-            );
-            return Ok(Some(rr));
-        }
-        if let Some(name) = find_node_at_offset::<ast::Name>(syntax, position.offset) {
-            let mut rr = ReferenceResolution::new(name.syntax().range());
-            if let Some(module) = name.syntax().parent().and_then(ast::Module::cast) {
-                if module.has_semi() {
-                    if let Some(child_module) =
-                        source_binder::module_from_declaration(self, position.file_id, module)?
-                    {
-                        let file_id = child_module.file_id();
-                        let name = match child_module.name() {
-                            Some(name) => name.to_string().into(),
-                            None => "".into(),
-                        };
-                        let symbol = NavigationTarget {
-                            file_id,
-                            name,
-                            range: TextRange::offset_len(0.into(), 0.into()),
-                            kind: MODULE,
-                            ptr: None,
-                        };
-                        rr.resolves_to.push(symbol);
-                        return Ok(Some(rr));
-                    }
-                }
-            }
-        }
-        Ok(None)
-    }
-
     pub(crate) fn find_all_refs(
         &self,
         position: FilePosition,

crates/ra_analysis/src/lib.rs

@@ -274,26 +274,6 @@ impl<T> RangeInfo<T> {
     }
 }
 
-/// Result of "goto def" query.
-#[derive(Debug)]
-pub struct ReferenceResolution {
-    /// The range of the reference itself. Client does not know what constitutes
-    /// a reference, it handles us only the offset. It's helpful to tell the
-    /// client where the reference was.
-    pub reference_range: TextRange,
-    /// What this reference resolves to.
-    pub resolves_to: Vec<NavigationTarget>,
-}
-
-impl ReferenceResolution {
-    fn new(reference_range: TextRange) -> ReferenceResolution {
-        ReferenceResolution {
-            reference_range,
-            resolves_to: Vec::new(),
-        }
-    }
-}
-
 /// `AnalysisHost` stores the current state of the world.
 #[derive(Debug, Default)]
 pub struct AnalysisHost {