From ec45dfea1e37ba40ea3e2c8c6df0991a3d49213f Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 28 Nov 2018 02:25:03 +0300 Subject: rename file_syntax -> source_file --- crates/ra_analysis/src/completion/mod.rs | 2 +- crates/ra_analysis/src/db.rs | 8 ++++---- crates/ra_analysis/src/hir/module/mod.rs | 4 ++-- crates/ra_analysis/src/hir/query_definitions.rs | 2 +- crates/ra_analysis/src/imp.rs | 18 +++++++++--------- crates/ra_analysis/src/symbol_index.rs | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'crates') diff --git a/crates/ra_analysis/src/completion/mod.rs b/crates/ra_analysis/src/completion/mod.rs index 67ec9a735..844dabb19 100644 --- a/crates/ra_analysis/src/completion/mod.rs +++ b/crates/ra_analysis/src/completion/mod.rs @@ -29,7 +29,7 @@ pub(crate) fn completions( db: &db::RootDatabase, position: FilePosition, ) -> Cancelable>> { - let original_file = db.file_syntax(position.file_id); + let original_file = db.source_file(position.file_id); // Insert a fake ident to get a valid parse tree let file = { let edit = AtomEdit::insert(position.offset, "intellijRulezz".to_string()); diff --git a/crates/ra_analysis/src/db.rs b/crates/ra_analysis/src/db.rs index 0901c2bba..11154cc65 100644 --- a/crates/ra_analysis/src/db.rs +++ b/crates/ra_analysis/src/db.rs @@ -117,7 +117,7 @@ salsa::database_storage! { fn crate_graph() for crate::input::CrateGraphQuery; } impl SyntaxDatabase { - fn file_syntax() for FileSyntaxQuery; + fn source_file() for SourceFileQuery; fn file_lines() for FileLinesQuery; } impl symbol_index::SymbolsDatabase { @@ -139,8 +139,8 @@ salsa::database_storage! { salsa::query_group! { pub(crate) trait SyntaxDatabase: crate::input::FilesDatabase + BaseDatabase { - fn file_syntax(file_id: FileId) -> SourceFileNode { - type FileSyntaxQuery; + fn source_file(file_id: FileId) -> SourceFileNode { + type SourceFileQuery; } fn file_lines(file_id: FileId) -> Arc { type FileLinesQuery; @@ -148,7 +148,7 @@ salsa::query_group! { } } -fn file_syntax(db: &impl SyntaxDatabase, file_id: FileId) -> SourceFileNode { +fn source_file(db: &impl SyntaxDatabase, file_id: FileId) -> SourceFileNode { let text = db.file_text(file_id); SourceFileNode::parse(&*text) } diff --git a/crates/ra_analysis/src/hir/module/mod.rs b/crates/ra_analysis/src/hir/module/mod.rs index a6b7a5466..83f176b32 100644 --- a/crates/ra_analysis/src/hir/module/mod.rs +++ b/crates/ra_analysis/src/hir/module/mod.rs @@ -49,7 +49,7 @@ impl Module { db: &impl HirDatabase, position: FilePosition, ) -> Cancelable> { - let file = db.file_syntax(position.file_id); + let file = db.source_file(position.file_id); let module_source = match find_node_at_offset::(file.syntax(), position.offset) { Some(m) if !m.has_semi() => ModuleSource::new_inline(db, position.file_id, m), @@ -346,7 +346,7 @@ impl ModuleSource { pub(crate) fn resolve(self, db: &impl HirDatabase) -> ModuleSourceNode { match self { ModuleSource::SourceFile(file_id) => { - let syntax = db.file_syntax(file_id); + let syntax = db.source_file(file_id); ModuleSourceNode::SourceFile(syntax.ast().owned()) } ModuleSource::Module(item_id) => { diff --git a/crates/ra_analysis/src/hir/query_definitions.rs b/crates/ra_analysis/src/hir/query_definitions.rs index 6c633e9ab..e7fba5d72 100644 --- a/crates/ra_analysis/src/hir/query_definitions.rs +++ b/crates/ra_analysis/src/hir/query_definitions.rs @@ -38,7 +38,7 @@ pub(super) fn fn_scopes(db: &impl HirDatabase, fn_id: FnId) -> Arc { } pub(super) fn file_items(db: &impl HirDatabase, file_id: FileId) -> Arc { - let source_file = db.file_syntax(file_id); + let source_file = db.source_file(file_id); let source_file = source_file.borrowed(); let mut res = SourceFileItems::default(); source_file diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index e3b78bb1a..c86bc111a 100644 --- a/crates/ra_analysis/src/imp.rs +++ b/crates/ra_analysis/src/imp.rs @@ -18,7 +18,7 @@ use salsa::{Database, ParallelDatabase}; use crate::{ completion::{completions, CompletionItem}, - db::{self, FileSyntaxQuery, SyntaxDatabase}, + db::{self, SourceFileQuery, SyntaxDatabase}, hir::{ self, FnSignatureInfo, @@ -189,7 +189,7 @@ impl fmt::Debug for AnalysisImpl { impl AnalysisImpl { pub fn file_syntax(&self, file_id: FileId) -> SourceFileNode { - self.db.file_syntax(file_id) + self.db.source_file(file_id) } pub fn file_line_index(&self, file_id: FileId) -> Arc { self.db.file_lines(file_id) @@ -220,7 +220,7 @@ impl AnalysisImpl { .collect() }; self.db - .query(FileSyntaxQuery) + .query(SourceFileQuery) .sweep(salsa::SweepStrategy::default().discard_values()); Ok(query.search(&buf)) } @@ -270,7 +270,7 @@ impl AnalysisImpl { &self, position: FilePosition, ) -> Cancelable> { - let file = self.db.file_syntax(position.file_id); + let file = self.db.source_file(position.file_id); let syntax = file.syntax(); if let Some(name_ref) = find_node_at_offset::(syntax, position.offset) { if let Some(fn_descr) = @@ -322,7 +322,7 @@ impl AnalysisImpl { } pub fn find_all_refs(&self, position: FilePosition) -> Vec<(FileId, TextRange)> { - let file = self.db.file_syntax(position.file_id); + let file = self.db.source_file(position.file_id); // Find the binding associated with the offset let (binding, descr) = match find_binding(&self.db, &file, position) { None => return Vec::new(), @@ -365,13 +365,13 @@ impl AnalysisImpl { file_id: FileId, symbol: FileSymbol, ) -> Cancelable> { - let file = self.db.file_syntax(file_id); + let file = self.db.source_file(file_id); Ok(symbol.docs(&file)) } pub fn diagnostics(&self, file_id: FileId) -> Cancelable> { - let syntax = self.db.file_syntax(file_id); + let syntax = self.db.source_file(file_id); let mut res = ra_editor::diagnostics(&syntax) .into_iter() @@ -459,7 +459,7 @@ impl AnalysisImpl { &self, position: FilePosition, ) -> Cancelable)>> { - let file = self.db.file_syntax(position.file_id); + let file = self.db.source_file(position.file_id); let syntax = file.syntax(); // Find the calling expression and it's NameRef @@ -470,7 +470,7 @@ 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.file_syntax(fn_file_id); + let fn_file = self.db.source_file(fn_file_id); if let Some(fn_def) = find_node_at_offset(fn_file.syntax(), fs.node_range.start()) { let descr = hir::Function::guess_from_source(&*self.db, fn_file_id, fn_def); if let Some(descriptor) = descr.signature_info(&*self.db) { diff --git a/crates/ra_analysis/src/symbol_index.rs b/crates/ra_analysis/src/symbol_index.rs index a6937d7f2..747b34e38 100644 --- a/crates/ra_analysis/src/symbol_index.rs +++ b/crates/ra_analysis/src/symbol_index.rs @@ -32,7 +32,7 @@ salsa::query_group! { fn file_symbols(db: &impl SyntaxDatabase, file_id: FileId) -> Cancelable> { db.check_canceled()?; - let syntax = db.file_syntax(file_id); + let syntax = db.source_file(file_id); Ok(Arc::new(SymbolIndex::for_file(file_id, syntax))) } -- cgit v1.2.3