diff options
Diffstat (limited to 'crates/ra_analysis/src/descriptors/function/scope.rs')
-rw-r--r-- | crates/ra_analysis/src/descriptors/function/scope.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crates/ra_analysis/src/descriptors/function/scope.rs b/crates/ra_analysis/src/descriptors/function/scope.rs index d9929414c..62b46ffba 100644 --- a/crates/ra_analysis/src/descriptors/function/scope.rs +++ b/crates/ra_analysis/src/descriptors/function/scope.rs | |||
@@ -51,9 +51,7 @@ impl FnScopes { | |||
51 | &self.get(scope).entries | 51 | &self.get(scope).entries |
52 | } | 52 | } |
53 | pub fn scope_chain<'a>(&'a self, node: SyntaxNodeRef) -> impl Iterator<Item = ScopeId> + 'a { | 53 | pub fn scope_chain<'a>(&'a self, node: SyntaxNodeRef) -> impl Iterator<Item = ScopeId> + 'a { |
54 | generate(self.scope_for(node), move |&scope| { | 54 | generate(self.scope_for(node), move |&scope| self.get(scope).parent) |
55 | self.get(scope).parent | ||
56 | }) | ||
57 | } | 55 | } |
58 | fn root_scope(&mut self) -> ScopeId { | 56 | fn root_scope(&mut self) -> ScopeId { |
59 | let res = ScopeId(self.scopes.len() as u32); | 57 | let res = ScopeId(self.scopes.len() as u32); |
@@ -273,13 +271,12 @@ pub fn resolve_local_name<'a>( | |||
273 | 271 | ||
274 | #[cfg(test)] | 272 | #[cfg(test)] |
275 | mod tests { | 273 | mod tests { |
274 | use ra_editor::find_node_at_offset; | ||
276 | use ra_syntax::File; | 275 | use ra_syntax::File; |
277 | use test_utils::extract_offset; | 276 | use test_utils::extract_offset; |
278 | use ra_editor::{find_node_at_offset}; | ||
279 | 277 | ||
280 | use super::*; | 278 | use super::*; |
281 | 279 | ||
282 | |||
283 | fn do_check(code: &str, expected: &[&str]) { | 280 | fn do_check(code: &str, expected: &[&str]) { |
284 | let (off, code) = extract_offset(code); | 281 | let (off, code) = extract_offset(code); |
285 | let code = { | 282 | let code = { |