Simplify

Author: matklad

crates/ra_analysis/src/imp.rs

@@ -207,7 +207,7 @@ impl AnalysisImpl {
         let syntax = file.syntax();
         if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(syntax, offset) {
             // First try to resolve the symbol locally
-            return if let Some((name, range)) = resolve_local_name(&file, offset, name_ref) {
+            return if let Some((name, range)) = resolve_local_name(name_ref) {
                 let mut vec = vec![];
                 vec.push((
                     file_id,
@@ -262,15 +262,15 @@ impl AnalysisImpl {
         if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(syntax, offset) {
 
             // We are only handing local references for now
-            if let Some(resolved) = resolve_local_name(&file, offset, name_ref) {
+            if let Some(resolved) = resolve_local_name(name_ref) {
 
                 ret.push((file_id, resolved.1));
 
                 if let Some(fn_def) = find_node_at_offset::<ast::FnDef>(syntax, offset) {
 
                     let refs : Vec<_> = fn_def.syntax().descendants()
                         .filter_map(ast::NameRef::cast)
-                        .filter(|n: &ast::NameRef| resolve_local_name(&file, n.syntax().range().start(), *n) == Some(resolved.clone()))
+                        .filter(|&n: &ast::NameRef| resolve_local_name(n) == Some(resolved.clone()))
                         .collect();
 
                     for r in refs {

crates/ra_editor/src/lib.rs

@@ -152,11 +152,9 @@ pub fn find_node_at_offset<'a, N: AstNode<'a>>(
 }
 
 pub fn resolve_local_name(
-    file: &File,
-    offset: TextUnit,
     name_ref: ast::NameRef,
 ) -> Option<(SmolStr, TextRange)> {
-    let fn_def = find_node_at_offset::<ast::FnDef>(file.syntax(), offset)?;
+    let fn_def = name_ref.syntax().ancestors().find_map(ast::FnDef::cast)?;
     let scopes = scope::FnScopes::new(fn_def);
     let scope_entry = scope::resolve_local_name(name_ref, &scopes)?;
     let name = scope_entry.ast().name()?;