From 08d1537468933910f22aa1cd517cae6b9f97d3ff Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 2 Jan 2019 19:20:56 +0300 Subject: get rid of AnalysisImpl --- crates/ra_analysis/src/imp.rs | 118 ++++++++++++++++++------------------------ crates/ra_analysis/src/lib.rs | 63 +++++++++++----------- 2 files changed, 80 insertions(+), 101 deletions(-) (limited to 'crates') diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index d9a3f97e9..0faf8b85d 100644 --- a/crates/ra_analysis/src/imp.rs +++ b/crates/ra_analysis/src/imp.rs @@ -1,9 +1,6 @@ -use std::{ - fmt, - sync::Arc, -}; +use std::sync::Arc; -use salsa::{Database, ParallelDatabase}; +use salsa::Database; use hir::{ self, FnSignatureInfo, Problem, source_binder, @@ -21,18 +18,12 @@ use ra_syntax::{ use crate::{ AnalysisChange, Cancelable, NavigationTarget, - completion::{CompletionItem, completions}, CrateId, db, Diagnostic, FileId, FilePosition, FileRange, FileSystemEdit, Query, ReferenceResolution, RootChange, SourceChange, SourceFileEdit, symbol_index::{LibrarySymbolsQuery, FileSymbol}, }; impl db::RootDatabase { - pub(crate) fn analysis(&self) -> AnalysisImpl { - AnalysisImpl { - db: self.snapshot(), - } - } pub(crate) fn apply_change(&mut self, change: AnalysisChange) { log::info!("apply_change {:?}", change); // self.gc_syntax_trees(); @@ -108,20 +99,9 @@ impl db::RootDatabase { } } -pub(crate) struct AnalysisImpl { - pub(crate) db: salsa::Snapshot, -} - -impl fmt::Debug for AnalysisImpl { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - let db: &db::RootDatabase = &self.db; - fmt.debug_struct("AnalysisImpl").field("db", db).finish() - } -} - -impl AnalysisImpl { +impl db::RootDatabase { pub(crate) fn module_path(&self, position: FilePosition) -> Cancelable> { - let descr = match source_binder::module_from_position(&*self.db, position)? { + let descr = match source_binder::module_from_position(self, position)? { None => return Ok(None), Some(it) => it, }; @@ -143,12 +123,15 @@ impl AnalysisImpl { /// This returns `Vec` because a module may be included from several places. We /// don't handle this case yet though, so the Vec has length at most one. - pub fn parent_module(&self, position: FilePosition) -> Cancelable> { - let descr = match source_binder::module_from_position(&*self.db, position)? { + pub(crate) fn parent_module( + &self, + position: FilePosition, + ) -> Cancelable> { + let descr = match source_binder::module_from_position(self, position)? { None => return Ok(Vec::new()), Some(it) => it, }; - let (file_id, decl) = match descr.parent_link_source(&*self.db) { + let (file_id, decl) = match descr.parent_link_source(self) { None => return Ok(Vec::new()), Some(it) => it, }; @@ -162,39 +145,33 @@ impl AnalysisImpl { Ok(vec![NavigationTarget { file_id, symbol }]) } /// Returns `Vec` for the same reason as `parent_module` - pub fn crate_for(&self, file_id: FileId) -> Cancelable> { - let descr = match source_binder::module_from_file_id(&*self.db, file_id)? { + pub(crate) fn crate_for(&self, file_id: FileId) -> Cancelable> { + let descr = match source_binder::module_from_file_id(self, file_id)? { None => return Ok(Vec::new()), Some(it) => it, }; let root = descr.crate_root(); let file_id = root.file_id(); - let crate_graph = self.db.crate_graph(); + let crate_graph = self.crate_graph(); let crate_id = crate_graph.crate_id_for_crate_root(file_id); Ok(crate_id.into_iter().collect()) } - pub fn crate_root(&self, crate_id: CrateId) -> FileId { - self.db.crate_graph().crate_root(crate_id) - } - pub fn completions(&self, position: FilePosition) -> Cancelable>> { - let completions = completions(&self.db, position)?; - Ok(completions.map(|it| it.into())) + pub(crate) fn crate_root(&self, crate_id: CrateId) -> FileId { + self.crate_graph().crate_root(crate_id) } - pub fn approximately_resolve_symbol( + pub(crate) fn approximately_resolve_symbol( &self, position: FilePosition, ) -> Cancelable> { - let file = self.db.source_file(position.file_id); + let file = self.source_file(position.file_id); let syntax = file.syntax(); if let Some(name_ref) = find_node_at_offset::(syntax, position.offset) { let mut rr = ReferenceResolution::new(name_ref.syntax().range()); - if let Some(fn_descr) = source_binder::function_from_child_node( - &*self.db, - position.file_id, - name_ref.syntax(), - )? { - let scope = fn_descr.scopes(&*self.db); + if let Some(fn_descr) = + source_binder::function_from_child_node(self, position.file_id, name_ref.syntax())? + { + let scope = fn_descr.scopes(self); // First try to resolve the symbol locally if let Some(entry) = scope.resolve_local_name(name_ref) { rr.add_resolution( @@ -219,7 +196,7 @@ impl AnalysisImpl { if let Some(module) = name.syntax().parent().and_then(ast::Module::cast) { if module.has_semi() { if let Some(child_module) = - source_binder::module_from_declaration(&*self.db, position.file_id, module)? + source_binder::module_from_declaration(self, position.file_id, module)? { let file_id = child_module.file_id(); let name = match child_module.name() { @@ -240,10 +217,13 @@ impl AnalysisImpl { Ok(None) } - pub fn find_all_refs(&self, position: FilePosition) -> Cancelable> { - let file = self.db.source_file(position.file_id); + pub(crate) fn find_all_refs( + &self, + position: FilePosition, + ) -> Cancelable> { + let file = self.source_file(position.file_id); // Find the binding associated with the offset - let (binding, descr) = match find_binding(&self.db, &file, position)? { + let (binding, descr) = match find_binding(self, &file, position)? { None => return Ok(Vec::new()), Some(it) => it, }; @@ -255,7 +235,7 @@ impl AnalysisImpl { .collect::>(); ret.extend( descr - .scopes(&*self.db) + .scopes(self) .find_all_refs(binding) .into_iter() .map(|ref_desc| (position.file_id, ref_desc.range)), @@ -293,8 +273,8 @@ impl AnalysisImpl { Ok(Some((binding, descr))) } } - pub fn doc_text_for(&self, nav: NavigationTarget) -> Cancelable> { - let file = self.db.source_file(nav.file_id); + pub(crate) fn doc_text_for(&self, nav: NavigationTarget) -> Cancelable> { + let file = self.source_file(nav.file_id); let result = match (nav.symbol.description(&file), nav.symbol.docs(&file)) { (Some(desc), Some(docs)) => { Some("```rust\n".to_string() + &*desc + "\n```\n\n" + &*docs) @@ -307,8 +287,8 @@ impl AnalysisImpl { Ok(result) } - pub fn diagnostics(&self, file_id: FileId) -> Cancelable> { - let syntax = self.db.source_file(file_id); + pub(crate) fn diagnostics(&self, file_id: FileId) -> Cancelable> { + let syntax = self.source_file(file_id); let mut res = ra_editor::diagnostics(&syntax) .into_iter() @@ -319,9 +299,9 @@ impl AnalysisImpl { fix: d.fix.map(|fix| SourceChange::from_local_edit(file_id, fix)), }) .collect::>(); - if let Some(m) = source_binder::module_from_file_id(&*self.db, file_id)? { - for (name_node, problem) in m.problems(&*self.db) { - let source_root = self.db.file_source_root(file_id); + if let Some(m) = source_binder::module_from_file_id(self, file_id)? { + for (name_node, problem) in m.problems(self) { + let source_root = self.file_source_root(file_id); let diag = match problem { Problem::UnresolvedModule { candidate } => { let create_file = FileSystemEdit::CreateFile { @@ -371,8 +351,8 @@ impl AnalysisImpl { Ok(res) } - pub fn assists(&self, frange: FileRange) -> Vec { - let file = self.db.source_file(frange.file_id); + pub(crate) fn assists(&self, frange: FileRange) -> Vec { + let file = self.source_file(frange.file_id); let offset = frange.range.start(); let actions = vec![ ra_editor::flip_comma(&file, offset).map(|f| f()), @@ -389,11 +369,11 @@ impl AnalysisImpl { .collect() } - pub fn resolve_callable( + pub(crate) fn resolve_callable( &self, position: FilePosition, ) -> Cancelable)>> { - let file = self.db.source_file(position.file_id); + let file = self.source_file(position.file_id); let syntax = file.syntax(); // Find the calling expression and it's NameRef @@ -404,12 +384,12 @@ impl AnalysisImpl { let file_symbols = self.index_resolve(name_ref)?; for (fn_file_id, fs) in file_symbols { if fs.kind == FN_DEF { - let fn_file = self.db.source_file(fn_file_id); + let fn_file = self.source_file(fn_file_id); if let Some(fn_def) = find_node_at_offset(fn_file.syntax(), fs.node_range.start()) { let descr = ctry!(source_binder::function_from_source( - &*self.db, fn_file_id, fn_def + self, fn_file_id, fn_def )?); - if let Some(descriptor) = descr.signature_info(&*self.db) { + if let Some(descriptor) = descr.signature_info(self) { // If we have a calling expression let's find which argument we are on let mut current_parameter = None; @@ -456,20 +436,20 @@ impl AnalysisImpl { Ok(None) } - pub fn type_of(&self, frange: FileRange) -> Cancelable> { - let file = self.db.source_file(frange.file_id); + pub(crate) fn type_of(&self, frange: FileRange) -> Cancelable> { + let file = self.source_file(frange.file_id); let syntax = file.syntax(); let node = find_covering_node(syntax, frange.range); let parent_fn = ctry!(node.ancestors().find_map(FnDef::cast)); let function = ctry!(source_binder::function_from_source( - &*self.db, + self, frange.file_id, parent_fn )?); - let infer = function.infer(&*self.db)?; + let infer = function.infer(self)?; Ok(infer.type_of_node(node).map(|t| t.to_string())) } - pub fn rename( + pub(crate) fn rename( &self, position: FilePosition, new_name: &str, @@ -493,7 +473,7 @@ impl AnalysisImpl { let mut query = Query::new(name.to_string()); query.exact(); query.limit(4); - crate::symbol_index::world_symbols(&*self.db, query) + crate::symbol_index::world_symbols(self, query) } } diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs index 03994b7c4..efb483103 100644 --- a/crates/ra_analysis/src/lib.rs +++ b/crates/ra_analysis/src/lib.rs @@ -27,11 +27,9 @@ use ra_syntax::{SourceFileNode, TextRange, TextUnit, SmolStr, SyntaxKind}; use ra_text_edit::TextEdit; use rayon::prelude::*; use relative_path::RelativePathBuf; +use salsa::ParallelDatabase; -use crate::{ - imp::AnalysisImpl, - symbol_index::{SymbolIndex, FileSymbol}, -}; +use crate::symbol_index::{SymbolIndex, FileSymbol}; pub use crate::{ completion::{CompletionItem, CompletionItemKind, InsertText}, @@ -161,7 +159,7 @@ impl AnalysisHost { /// semantic information. pub fn analysis(&self) -> Analysis { Analysis { - imp: self.db.analysis(), + db: self.db.snapshot(), } } /// Applies changes to the current state of the world. If there are @@ -293,56 +291,56 @@ impl ReferenceResolution { /// `Analysis` are canceled (most method return `Err(Canceled)`). #[derive(Debug)] pub struct Analysis { - pub(crate) imp: AnalysisImpl, + db: salsa::Snapshot, } impl Analysis { pub fn file_text(&self, file_id: FileId) -> Arc { - self.imp.db.file_text(file_id) + self.db.file_text(file_id) } pub fn file_syntax(&self, file_id: FileId) -> SourceFileNode { - self.imp.db.source_file(file_id).clone() + self.db.source_file(file_id).clone() } pub fn file_line_index(&self, file_id: FileId) -> Arc { - self.imp.db.file_lines(file_id) + self.db.file_lines(file_id) } pub fn extend_selection(&self, frange: FileRange) -> TextRange { - extend_selection::extend_selection(&self.imp.db, frange) + extend_selection::extend_selection(&self.db, frange) } pub fn matching_brace(&self, file: &SourceFileNode, offset: TextUnit) -> Option { ra_editor::matching_brace(file, offset) } pub fn syntax_tree(&self, file_id: FileId) -> String { - let file = self.imp.db.source_file(file_id); + let file = self.db.source_file(file_id); ra_editor::syntax_tree(&file) } pub fn join_lines(&self, frange: FileRange) -> SourceChange { - let file = self.imp.db.source_file(frange.file_id); + let file = self.db.source_file(frange.file_id); SourceChange::from_local_edit(frange.file_id, ra_editor::join_lines(&file, frange.range)) } pub fn on_enter(&self, position: FilePosition) -> Option { - let file = self.imp.db.source_file(position.file_id); + let file = self.db.source_file(position.file_id); let edit = ra_editor::on_enter(&file, position.offset)?; let res = SourceChange::from_local_edit(position.file_id, edit); Some(res) } pub fn on_eq_typed(&self, position: FilePosition) -> Option { - let file = self.imp.db.source_file(position.file_id); + let file = self.db.source_file(position.file_id); Some(SourceChange::from_local_edit( position.file_id, ra_editor::on_eq_typed(&file, position.offset)?, )) } pub fn file_structure(&self, file_id: FileId) -> Vec { - let file = self.imp.db.source_file(file_id); + let file = self.db.source_file(file_id); ra_editor::file_structure(&file) } pub fn folding_ranges(&self, file_id: FileId) -> Vec { - let file = self.imp.db.source_file(file_id); + let file = self.db.source_file(file_id); ra_editor::folding_ranges(&file) } pub fn symbol_search(&self, query: Query) -> Cancelable> { - let res = symbol_index::world_symbols(&*self.imp.db, query)? + let res = symbol_index::world_symbols(&*self.db, query)? .into_iter() .map(|(file_id, symbol)| NavigationTarget { file_id, symbol }) .collect(); @@ -352,57 +350,58 @@ impl Analysis { &self, position: FilePosition, ) -> Cancelable> { - self.imp.approximately_resolve_symbol(position) + self.db.approximately_resolve_symbol(position) } pub fn find_all_refs(&self, position: FilePosition) -> Cancelable> { - self.imp.find_all_refs(position) + self.db.find_all_refs(position) } pub fn doc_text_for(&self, nav: NavigationTarget) -> Cancelable> { - self.imp.doc_text_for(nav) + self.db.doc_text_for(nav) } pub fn parent_module(&self, position: FilePosition) -> Cancelable> { - self.imp.parent_module(position) + self.db.parent_module(position) } pub fn module_path(&self, position: FilePosition) -> Cancelable> { - self.imp.module_path(position) + self.db.module_path(position) } pub fn crate_for(&self, file_id: FileId) -> Cancelable> { - self.imp.crate_for(file_id) + self.db.crate_for(file_id) } pub fn crate_root(&self, crate_id: CrateId) -> Cancelable { - Ok(self.imp.crate_root(crate_id)) + Ok(self.db.crate_root(crate_id)) } pub fn runnables(&self, file_id: FileId) -> Cancelable> { - let file = self.imp.db.source_file(file_id); + let file = self.db.source_file(file_id); Ok(runnables::runnables(self, &file, file_id)) } pub fn highlight(&self, file_id: FileId) -> Cancelable> { - syntax_highlighting::highlight(&*self.imp.db, file_id) + syntax_highlighting::highlight(&*self.db, file_id) } pub fn completions(&self, position: FilePosition) -> Cancelable>> { - self.imp.completions(position) + let completions = completion::completions(&self.db, position)?; + Ok(completions.map(|it| it.into())) } pub fn assists(&self, frange: FileRange) -> Cancelable> { - Ok(self.imp.assists(frange)) + Ok(self.db.assists(frange)) } pub fn diagnostics(&self, file_id: FileId) -> Cancelable> { - self.imp.diagnostics(file_id) + self.db.diagnostics(file_id) } pub fn resolve_callable( &self, position: FilePosition, ) -> Cancelable)>> { - self.imp.resolve_callable(position) + self.db.resolve_callable(position) } pub fn type_of(&self, frange: FileRange) -> Cancelable> { - self.imp.type_of(frange) + self.db.type_of(frange) } pub fn rename( &self, position: FilePosition, new_name: &str, ) -> Cancelable> { - self.imp.rename(position, new_name) + self.db.rename(position, new_name) } } -- cgit v1.2.3