aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/code_model_impl/function
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir/src/code_model_impl/function')
-rw-r--r--crates/ra_hir/src/code_model_impl/function/scope.rs31
1 files changed, 23 insertions, 8 deletions
diff --git a/crates/ra_hir/src/code_model_impl/function/scope.rs b/crates/ra_hir/src/code_model_impl/function/scope.rs
index 7d938c0dd..afca1e9f8 100644
--- a/crates/ra_hir/src/code_model_impl/function/scope.rs
+++ b/crates/ra_hir/src/code_model_impl/function/scope.rs
@@ -422,6 +422,9 @@ mod tests {
422 fn do_check_local_name(code: &str, expected_offset: u32) { 422 fn do_check_local_name(code: &str, expected_offset: u32) {
423 let (off, code) = extract_offset(code); 423 let (off, code) = extract_offset(code);
424 let file = SourceFile::parse(&code); 424 let file = SourceFile::parse(&code);
425 let expected_name = find_node_at_offset::<ast::Name>(file.syntax(), expected_offset.into())
426 .expect("failed to find a name at the target offset");
427
425 let fn_def: &ast::FnDef = find_node_at_offset(file.syntax(), off).unwrap(); 428 let fn_def: &ast::FnDef = find_node_at_offset(file.syntax(), off).unwrap();
426 let name_ref: &ast::NameRef = find_node_at_offset(file.syntax(), off).unwrap(); 429 let name_ref: &ast::NameRef = find_node_at_offset(file.syntax(), off).unwrap();
427 430
@@ -431,11 +434,8 @@ mod tests {
431 scopes: Arc::new(scopes), 434 scopes: Arc::new(scopes),
432 syntax_mapping: Arc::new(body_hir), 435 syntax_mapping: Arc::new(body_hir),
433 }; 436 };
434
435 let local_name_entry = scopes.resolve_local_name(name_ref).unwrap(); 437 let local_name_entry = scopes.resolve_local_name(name_ref).unwrap();
436 let local_name = local_name_entry.ptr(); 438 let local_name = local_name_entry.ptr();
437 let expected_name =
438 find_node_at_offset::<ast::Name>(file.syntax(), expected_offset.into()).unwrap();
439 assert_eq!(local_name.range(), expected_name.syntax().range()); 439 assert_eq!(local_name.range(), expected_name.syntax().range());
440 } 440 }
441 441
@@ -470,11 +470,26 @@ mod tests {
470 fn test_resolve_local_name_shadow() { 470 fn test_resolve_local_name_shadow() {
471 do_check_local_name( 471 do_check_local_name(
472 r" 472 r"
473 fn foo(x: String) { 473 fn foo(x: String) {
474 let x : &str = &x; 474 let x : &str = &x;
475 x<|> 475 x<|>
476 }", 476 }
477 46, 477 ",
478 53,
479 );
480 }
481
482 #[test]
483 fn ref_patterns_contribute_bindings() {
484 do_check_local_name(
485 r"
486 fn foo() {
487 if let Some(&from) = bar() {
488 from<|>;
489 }
490 }
491 ",
492 53,
478 ); 493 );
479 } 494 }
480} 495}