1 files changed, 16 insertions, 20 deletions

diff --git a/crates/ra_hir/src/expr/scope.rs b/crates/ra_hir/src/expr/scope.rs
index bb8d50db8..81fbc509e 100644
--- a/crates/ra_hir/src/expr/scope.rs
+++ b/crates/ra_hir/src/expr/scope.rs
@@ -11,7 +11,7 @@ use ra_arena::{Arena, RawId, impl_arena_id};
 
 use crate::{
     Name, AsName, Function,
-    expr::{PatId, ExprId, Pat, Expr, Body, Statement, BodySyntaxMapping},
+    expr::{PatId, ExprId, Pat, Expr, Body, Statement, BodySourceMap},
     HirDatabase,
 };
 
@@ -108,8 +108,8 @@ impl ExprScopes {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ScopesWithSyntaxMapping {
-    pub syntax_mapping: Arc<BodySyntaxMapping>,
+pub struct ScopesWithSourceMap {
+    pub source_map: Arc<BodySourceMap>,
     pub scopes: Arc<ExprScopes>,
 }
 
@@ -129,7 +129,7 @@ impl ScopeEntryWithSyntax {
     }
 }
 
-impl ScopesWithSyntaxMapping {
+impl ScopesWithSourceMap {
     fn scope_chain<'a>(&'a self, node: &SyntaxNode) -> impl Iterator<Item = ScopeId> + 'a {
         generate(self.scope_for(node), move |&scope| self.scopes.scopes[scope].parent)
     }
@@ -138,7 +138,7 @@ impl ScopesWithSyntaxMapping {
         self.scopes
             .scope_for
             .iter()
-            .filter_map(|(id, scope)| Some((self.syntax_mapping.expr_syntax(*id)?, scope)))
+            .filter_map(|(id, scope)| Some((self.source_map.expr_syntax(*id)?, scope)))
             // find containing scope
             .min_by_key(|(ptr, _scope)| {
                 (!(ptr.range().start() <= offset && offset <= ptr.range().end()), ptr.range().len())
@@ -155,7 +155,7 @@ impl ScopesWithSyntaxMapping {
             .scopes
             .scope_for
             .iter()
-            .filter_map(|(id, scope)| Some((self.syntax_mapping.expr_syntax(*id)?, scope)))
+            .filter_map(|(id, scope)| Some((self.source_map.expr_syntax(*id)?, scope)))
             .map(|(ptr, scope)| (ptr.range(), scope))
             .filter(|(range, _)| range.start() <= offset && range.is_subrange(&r) && *range != r);
 
@@ -185,7 +185,7 @@ impl ScopesWithSyntaxMapping {
         ret.and_then(|entry| {
             Some(ScopeEntryWithSyntax {
                 name: entry.name().clone(),
-                ptr: self.syntax_mapping.pat_syntax(entry.pat())?,
+                ptr: self.source_map.pat_syntax(entry.pat())?,
             })
         })
     }
@@ -211,7 +211,7 @@ impl ScopesWithSyntaxMapping {
     pub fn scope_for(&self, node: &SyntaxNode) -> Option<ScopeId> {
         node.ancestors()
             .map(SyntaxNodePtr::new)
-            .filter_map(|ptr| self.syntax_mapping.syntax_expr(ptr))
+            .filter_map(|ptr| self.source_map.syntax_expr(ptr))
             .find_map(|it| self.scopes.scope_for(it))
     }
 }
@@ -316,12 +316,10 @@ mod tests {
         let marker: &ast::PathExpr = find_node_at_offset(file.syntax(), off).unwrap();
         let fn_def: &ast::FnDef = find_node_at_offset(file.syntax(), off).unwrap();
         let irrelevant_function = Function { id: crate::ids::FunctionId::from_raw(0.into()) };
-        let body_hir = expr::collect_fn_body_syntax(irrelevant_function, fn_def);
-        let scopes = ExprScopes::new(Arc::clone(body_hir.body()));
-        let scopes = ScopesWithSyntaxMapping {
-            scopes: Arc::new(scopes),
-            syntax_mapping: Arc::new(body_hir),
-        };
+        let (body, source_map) = expr::collect_fn_body_syntax(irrelevant_function, fn_def);
+        let scopes = ExprScopes::new(Arc::new(body));
+        let scopes =
+            ScopesWithSourceMap { scopes: Arc::new(scopes), source_map: Arc::new(source_map) };
         let actual = scopes
             .scope_chain(marker.syntax())
             .flat_map(|scope| scopes.scopes.entries(scope))
@@ -417,12 +415,10 @@ mod tests {
         let name_ref: &ast::NameRef = find_node_at_offset(file.syntax(), off).unwrap();
 
         let irrelevant_function = Function { id: crate::ids::FunctionId::from_raw(0.into()) };
-        let body_hir = expr::collect_fn_body_syntax(irrelevant_function, fn_def);
-        let scopes = ExprScopes::new(Arc::clone(body_hir.body()));
-        let scopes = ScopesWithSyntaxMapping {
-            scopes: Arc::new(scopes),
-            syntax_mapping: Arc::new(body_hir),
-        };
+        let (body, source_map) = expr::collect_fn_body_syntax(irrelevant_function, fn_def);
+        let scopes = ExprScopes::new(Arc::new(body));
+        let scopes =
+            ScopesWithSourceMap { scopes: Arc::new(scopes), source_map: Arc::new(source_map) };
         let local_name_entry = scopes.resolve_local_name(name_ref).unwrap();
         let local_name = local_name_entry.ptr();
         assert_eq!(local_name.range(), expected_name.syntax().range());