diff options
author | Aleksey Kladov <[email protected]> | 2019-07-19 08:43:01 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-07-19 11:16:25 +0100 |
commit | e2b28f5bb8043e92b10f6a40696131007fc9dfe2 (patch) | |
tree | c14306038e386d71ddc894d63415bf8e9a94f7e8 /crates/ra_hir/src/expr/scope.rs | |
parent | 7e02aa0efff228126ffc43e81e5e127e1b9e32dd (diff) |
migrate ra_hir to the new rowan
Diffstat (limited to 'crates/ra_hir/src/expr/scope.rs')
-rw-r--r-- | crates/ra_hir/src/expr/scope.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/expr/scope.rs b/crates/ra_hir/src/expr/scope.rs index 28fd52684..6589b782c 100644 --- a/crates/ra_hir/src/expr/scope.rs +++ b/crates/ra_hir/src/expr/scope.rs | |||
@@ -190,7 +190,7 @@ mod tests { | |||
190 | 190 | ||
191 | let (db, _source_root, file_id) = MockDatabase::with_single_file(&code); | 191 | let (db, _source_root, file_id) = MockDatabase::with_single_file(&code); |
192 | let file = db.parse(file_id).ok().unwrap(); | 192 | let file = db.parse(file_id).ok().unwrap(); |
193 | let marker: &ast::PathExpr = find_node_at_offset(file.syntax(), off).unwrap(); | 193 | let marker: ast::PathExpr = find_node_at_offset(file.syntax(), off).unwrap(); |
194 | let analyzer = SourceAnalyzer::new(&db, file_id, marker.syntax(), None); | 194 | let analyzer = SourceAnalyzer::new(&db, file_id, marker.syntax(), None); |
195 | 195 | ||
196 | let scopes = analyzer.scopes(); | 196 | let scopes = analyzer.scopes(); |
@@ -290,10 +290,10 @@ mod tests { | |||
290 | let file = db.parse(file_id).ok().unwrap(); | 290 | let file = db.parse(file_id).ok().unwrap(); |
291 | let expected_name = find_node_at_offset::<ast::Name>(file.syntax(), expected_offset.into()) | 291 | let expected_name = find_node_at_offset::<ast::Name>(file.syntax(), expected_offset.into()) |
292 | .expect("failed to find a name at the target offset"); | 292 | .expect("failed to find a name at the target offset"); |
293 | let name_ref: &ast::NameRef = find_node_at_offset(file.syntax(), off).unwrap(); | 293 | let name_ref: ast::NameRef = find_node_at_offset(file.syntax(), off).unwrap(); |
294 | let analyzer = SourceAnalyzer::new(&db, file_id, name_ref.syntax(), None); | 294 | let analyzer = SourceAnalyzer::new(&db, file_id, name_ref.syntax(), None); |
295 | 295 | ||
296 | let local_name_entry = analyzer.resolve_local_name(name_ref).unwrap(); | 296 | let local_name_entry = analyzer.resolve_local_name(&name_ref).unwrap(); |
297 | let local_name = | 297 | let local_name = |
298 | local_name_entry.ptr().either(|it| it.syntax_node_ptr(), |it| it.syntax_node_ptr()); | 298 | local_name_entry.ptr().either(|it| it.syntax_node_ptr(), |it| it.syntax_node_ptr()); |
299 | assert_eq!(local_name.range(), expected_name.syntax().range()); | 299 | assert_eq!(local_name.range(), expected_name.syntax().range()); |