1 files changed, 16 insertions, 2 deletions

diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index 90184a4b9..517867e86 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -9,7 +9,7 @@ use std::{
 };
 
 use relative_path::RelativePath;
-use ra_editor::{self, FileSymbol, LineIndex, find_node_at_offset, LocalEdit};
+use ra_editor::{self, FileSymbol, LineIndex, find_node_at_offset, LocalEdit, resolve_local_name};
 use ra_syntax::{
     TextUnit, TextRange, SmolStr, File, AstNode,
     SyntaxKind::*,
@@ -197,7 +197,21 @@ impl AnalysisImpl {
         let file = root.syntax(file_id);
         let syntax = file.syntax();
         if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(syntax, offset) {
-            return self.index_resolve(name_ref, token);
+
+            // First try to resolve the symbol locally
+            if let Some((name, range)) = resolve_local_name(&file, offset, name_ref) {
+                let mut vec = vec![];
+                vec.push((file_id, FileSymbol {
+                    name,
+                    node_range: range,
+                    kind : NAME
+                }));
+
+                return vec;
+            } else {
+                // If that fails try the index based approach.
+                return self.index_resolve(name_ref, token);
+            }
         }
         if let Some(name) = find_node_at_offset::<ast::Name>(syntax, offset) {
             if let Some(module) = name.syntax().parent().and_then(ast::Module::cast) {