aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_def/src/body
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir_def/src/body')
-rw-r--r--crates/ra_hir_def/src/body/scope.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs
index 10cb87d37..aeb71ff22 100644
--- a/crates/ra_hir_def/src/body/scope.rs
+++ b/crates/ra_hir_def/src/body/scope.rs
@@ -210,8 +210,9 @@ mod tests {
210 let scopes = db.expr_scopes(function.into()); 210 let scopes = db.expr_scopes(function.into());
211 let (_body, source_map) = db.body_with_source_map(function.into()); 211 let (_body, source_map) = db.body_with_source_map(function.into());
212 212
213 let expr_id = 213 let expr_id = source_map
214 source_map.node_expr(Source { file_id: file_id.into(), ast: &marker.into() }).unwrap(); 214 .node_expr(Source { file_id: file_id.into(), value: &marker.into() })
215 .unwrap();
215 let scope = scopes.scope_for(expr_id); 216 let scope = scopes.scope_for(expr_id);
216 217
217 let actual = scopes 218 let actual = scopes
@@ -317,14 +318,14 @@ mod tests {
317 let expr_scope = { 318 let expr_scope = {
318 let expr_ast = name_ref.syntax().ancestors().find_map(ast::Expr::cast).unwrap(); 319 let expr_ast = name_ref.syntax().ancestors().find_map(ast::Expr::cast).unwrap();
319 let expr_id = 320 let expr_id =
320 source_map.node_expr(Source { file_id: file_id.into(), ast: &expr_ast }).unwrap(); 321 source_map.node_expr(Source { file_id: file_id.into(), value: &expr_ast }).unwrap();
321 scopes.scope_for(expr_id).unwrap() 322 scopes.scope_for(expr_id).unwrap()
322 }; 323 };
323 324
324 let resolved = scopes.resolve_name_in_scope(expr_scope, &name_ref.as_name()).unwrap(); 325 let resolved = scopes.resolve_name_in_scope(expr_scope, &name_ref.as_name()).unwrap();
325 let pat_src = source_map.pat_syntax(resolved.pat()).unwrap(); 326 let pat_src = source_map.pat_syntax(resolved.pat()).unwrap();
326 327
327 let local_name = pat_src.ast.either(|it| it.syntax_node_ptr(), |it| it.syntax_node_ptr()); 328 let local_name = pat_src.value.either(|it| it.syntax_node_ptr(), |it| it.syntax_node_ptr());
328 assert_eq!(local_name.range(), expected_name.syntax().text_range()); 329 assert_eq!(local_name.range(), expected_name.syntax().text_range());
329 } 330 }
330 331