From 41745f48d5f867ff0896ce7906b5b4c04e72a767 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 15 Mar 2021 12:18:52 +0100 Subject: move Semantics::visit_file_defs to ide_db::helpers --- crates/hir/src/semantics.rs | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'crates/hir/src') diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs index 2a0a36de4..945638cc5 100644 --- a/crates/hir/src/semantics.rs +++ b/crates/hir/src/semantics.rs @@ -2,12 +2,10 @@ mod source_to_def; -use std::{cell::RefCell, collections::VecDeque, fmt, iter::successors}; +use std::{cell::RefCell, fmt, iter::successors}; use base_db::{FileId, FileRange}; -use either::Either; use hir_def::{ - nameres::ModuleSource, resolver::{self, HasResolver, Resolver, TypeNs}, AsMacroCall, FunctionId, TraitId, VariantId, }; @@ -157,28 +155,6 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> { self.imp.ancestors_at_offset_with_macros(node, offset) } - /// Iterates all `ModuleDef`s and `Impl` blocks of the given file. - pub fn visit_file_defs(&self, file_id: FileId, cb: &mut dyn FnMut(Either)) { - let module = match self.to_module_def(file_id) { - Some(it) => it, - None => return, - }; - let mut defs: VecDeque<_> = module.declarations(self.db).into(); - while let Some(def) = defs.pop_front() { - if let ModuleDef::Module(submodule) = def { - if let ModuleSource::Module(_) = submodule.definition_source(self.db).value { - defs.extend(submodule.declarations(self.db)); - submodule - .impl_defs(self.db) - .into_iter() - .for_each(|impl_| cb(Either::Right(impl_))); - } - } - cb(Either::Left(def)); - } - module.impl_defs(self.db).into_iter().for_each(|impl_| cb(Either::Right(impl_))); - } - /// Find a AstNode by offset inside SyntaxNode, if it is inside *Macrofile*, /// search up until it is of the target AstNode type pub fn find_node_at_offset_with_macros( -- cgit v1.2.3