From 3aae223d938e5a36d997c45a0f86cfcabf83b570 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 13 Apr 2019 09:31:03 +0300 Subject: hide some scopes --- crates/ra_ide_api/src/references.rs | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'crates/ra_ide_api/src') diff --git a/crates/ra_ide_api/src/references.rs b/crates/ra_ide_api/src/references.rs index 3e30e047c..ee2c1d0f0 100644 --- a/crates/ra_ide_api/src/references.rs +++ b/crates/ra_ide_api/src/references.rs @@ -61,12 +61,11 @@ pub(crate) fn find_all_refs( position: FilePosition, ) -> Option { let file = db.parse(position.file_id); - let (binding, descr) = find_binding(db, &file, position)?; + let (binding, analyzer) = find_binding(db, &file, position)?; let declaration = NavigationTarget::from_bind_pat(position.file_id, binding); - let references = descr - .scopes(db) - .find_all_refs(binding) + let references = analyzer + .find_all_refs(binding)? .into_iter() .map(move |ref_desc| FileRange { file_id: position.file_id, range: ref_desc.range }) .collect::>(); @@ -77,21 +76,18 @@ pub(crate) fn find_all_refs( db: &RootDatabase, source_file: &'a SourceFile, position: FilePosition, - ) -> Option<(&'a ast::BindPat, hir::Function)> { + ) -> Option<(&'a ast::BindPat, hir::SourceAnalyzer)> { let syntax = source_file.syntax(); if let Some(binding) = find_node_at_offset::(syntax, position.offset) { - let descr = - source_binder::function_from_child_node(db, position.file_id, binding.syntax())?; - return Some((binding, descr)); + let analyzer = hir::SourceAnalyzer::new(db, position.file_id, binding.syntax(), None); + return Some((binding, analyzer)); }; let name_ref = find_node_at_offset::(syntax, position.offset)?; - let descr = - source_binder::function_from_child_node(db, position.file_id, name_ref.syntax())?; - let scope = descr.scopes(db); - let resolved = scope.resolve_local_name(name_ref)?; + let analyzer = hir::SourceAnalyzer::new(db, position.file_id, name_ref.syntax(), None); + let resolved = analyzer.resolve_local_name(name_ref)?; if let Either::A(ptr) = resolved.ptr() { if let ast::PatKind::BindPat(binding) = ptr.to_node(source_file).kind() { - return Some((binding, descr)); + return Some((binding, analyzer)); } } None -- cgit v1.2.3