rename FilesDatabase -> SourceDatabase

diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index cab47dcacce0d6b54d08d21b7b935d1c4dee4c77..2664dc69a25b494fb58444ca3152b4b59085a768 100644 (file)
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -63,8 +63,10 @@ pub struct FileRange {
     pub range: TextRange,
 }
 
-#[salsa::query_group(FilesDatabaseStorage)]
-pub trait FilesDatabase: salsa::Database + CheckCanceled {
+/// Database which stores all significant input facts: source code and project
+/// model. Everything else in rust-analyzer is derived from these queries.
+#[salsa::query_group(SourceDatabaseStorage)]
+pub trait SourceDatabase: salsa::Database + CheckCanceled {
     /// Text of the file.
     #[salsa::input]
     fn file_text(&self, file_id: FileId) -> Arc<String>;
@@ -85,7 +87,7 @@ pub trait FilesDatabase: salsa::Database + CheckCanceled {
     fn crate_graph(&self) -> Arc<CrateGraph>;
 }
 
-fn source_root_crates(db: &impl FilesDatabase, id: SourceRootId) -> Arc<Vec<CrateId>> {
+fn source_root_crates(db: &impl SourceDatabase, id: SourceRootId) -> Arc<Vec<CrateId>> {
     let root = db.source_root(id);
     let graph = db.crate_graph();
     let res = root
@@ -96,7 +98,7 @@ fn source_root_crates(db: &impl FilesDatabase, id: SourceRootId) -> Arc<Vec<Crat
     Arc::new(res)
 }
 
-fn source_file(db: &impl FilesDatabase, file_id: FileId) -> TreeArc<SourceFile> {
+fn source_file(db: &impl SourceDatabase, file_id: FileId) -> TreeArc<SourceFile> {
     let text = db.file_text(file_id);
     SourceFile::parse(&*text)
 }

diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 1bb9e030569e72e923d365fec687a827badb5edf..9b5b79d38dc29aaf2ed21a3cac364e2ccf4260a9 100644 (file)
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use ra_syntax::{SyntaxNode, TreeArc, SourceFile};
-use ra_db::{FilesDatabase, CrateId, salsa};
+use ra_db::{SourceDatabase, CrateId, salsa};
 
 use crate::{
     MacroCallId, HirFileId,
@@ -19,7 +19,7 @@
 };
 
 #[salsa::query_group(HirDatabaseStorage)]
-pub trait HirDatabase: FilesDatabase + AsRef<HirInterner> {
+pub trait HirDatabase: SourceDatabase + AsRef<HirInterner> {
     #[salsa::invoke(HirFileId::hir_source_file)]
     fn hir_source_file(&self, file_id: HirFileId) -> TreeArc<SourceFile>;
 

diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs
index cfbe652b0ab4ff24869c7b6364f2610f6775c9d3..7da15eca0140eb596e0c694c8bb80e130bb85440 100644 (file)
--- a/crates/ra_hir/src/mock.rs
+++ b/crates/ra_hir/src/mock.rs
@@ -2,7 +2,7 @@
 
 use parking_lot::Mutex;
 use ra_db::{
-    CheckCanceled, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, FilesDatabase, salsa,
+    CheckCanceled, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, SourceDatabase, salsa,
 };
 use relative_path::RelativePathBuf;
 use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset};
@@ -11,7 +11,7 @@
 
 pub const WORKSPACE: SourceRootId = SourceRootId(0);
 
-#[salsa::database(ra_db::FilesDatabaseStorage, db::HirDatabaseStorage)]
+#[salsa::database(ra_db::SourceDatabaseStorage, db::HirDatabaseStorage)]
 #[derive(Debug)]
 pub(crate) struct MockDatabase {
     events: Mutex<Option<Vec<salsa::Event<MockDatabase>>>>,

diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs
index 24936976c22f181c588d933212235469a127ee02..e72781f512e1d079a31a8d9eeb88c41a147c9243 100644 (file)
--- a/crates/ra_hir/src/nameres/tests.rs
+++ b/crates/ra_hir/src/nameres/tests.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use ra_db::{CrateGraph, SourceRootId, FilesDatabase};
+use ra_db::{CrateGraph, SourceRootId, SourceDatabase};
 use relative_path::RelativePath;
 use test_utils::{assert_eq_text, covers};
 

diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index a56783b6e65d6b851f60ecf2430898531e4ba9cf..0eb4da06e752df9eaa776dc24aad1f81a5e52b1c 100644 (file)
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 use std::fmt::Write;
 
-use ra_db::{FilesDatabase, salsa::Database};
+use ra_db::{SourceDatabase, salsa::Database};
 use ra_syntax::ast::{self, AstNode};
 
 use crate::{

diff --git a/crates/ra_ide_api/src/call_info.rs b/crates/ra_ide_api/src/call_info.rs
index 0eb70df1620332c7aa38a25e21f140f82197013e..728f2df30005c339924dc15654bdd6888e680e76 100644 (file)
--- a/crates/ra_ide_api/src/call_info.rs
+++ b/crates/ra_ide_api/src/call_info.rs
@@ -1,4 +1,4 @@
-use ra_db::FilesDatabase;
+use ra_db::SourceDatabase;
 use ra_syntax::{
     AstNode, SyntaxNode, TextUnit, TextRange,
     SyntaxKind::FN_DEF,

diff --git a/crates/ra_ide_api/src/completion.rs b/crates/ra_ide_api/src/completion.rs
index 581ba5de81424d7eb1f6114c1ea2f52f76f07dd0..be64f2c5a2585c6ee68064c7ac4883950856ccee 100644 (file)
--- a/crates/ra_ide_api/src/completion.rs
+++ b/crates/ra_ide_api/src/completion.rs
@@ -9,7 +9,7 @@
 mod complete_scope;
 mod complete_postfix;
 
-use ra_db::FilesDatabase;
+use ra_db::SourceDatabase;
 
 use crate::{
     db,

diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs
index 119190e0aa558d9ac52be1ea08d970e62c8bd70d..3da93ec35b68471740ca9cde80517634523187f4 100644 (file)
--- a/crates/ra_ide_api/src/db.rs
+++ b/crates/ra_ide_api/src/db.rs
@@ -1,14 +1,14 @@
 use std::sync::Arc;
 
 use ra_db::{
-    CheckCanceled, FileId, Canceled, FilesDatabase,
+    CheckCanceled, FileId, Canceled, SourceDatabase,
     salsa,
 };
 
 use crate::{LineIndex, symbol_index::{self, SymbolsDatabase}};
 
 #[salsa::database(
-    ra_db::FilesDatabaseStorage,
+    ra_db::SourceDatabaseStorage,
     LineIndexDatabaseStorage,
     symbol_index::SymbolsDatabaseStorage,
     hir::db::HirDatabaseStorage
@@ -59,11 +59,11 @@ fn as_ref(&self) -> &hir::HirInterner {
 }
 
 #[salsa::query_group(LineIndexDatabaseStorage)]
-pub(crate) trait LineIndexDatabase: ra_db::FilesDatabase + CheckCanceled {
+pub(crate) trait LineIndexDatabase: ra_db::SourceDatabase + CheckCanceled {
     fn line_index(&self, file_id: FileId) -> Arc<LineIndex>;
 }
 
-fn line_index(db: &impl ra_db::FilesDatabase, file_id: FileId) -> Arc<LineIndex> {
+fn line_index(db: &impl ra_db::SourceDatabase, file_id: FileId) -> Arc<LineIndex> {
     let text = db.file_text(file_id);
     Arc::new(LineIndex::new(&*text))
 }

diff --git a/crates/ra_ide_api/src/extend_selection.rs b/crates/ra_ide_api/src/extend_selection.rs
index bc19b0b9d9e166a1d25da0f4e5b2e33a43629197..1cd9553577ebd31aed2e15d57942193ab8d0ea86 100644 (file)
--- a/crates/ra_ide_api/src/extend_selection.rs
+++ b/crates/ra_ide_api/src/extend_selection.rs
@@ -1,4 +1,4 @@
-use ra_db::FilesDatabase;
+use ra_db::SourceDatabase;
 use ra_syntax::{
     SyntaxNode, AstNode, SourceFile,
     ast, algo::find_covering_node,

diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs
index 0e40e35cef1b03362e6739784821afbc2028af4d..180cc7c809ff069f619c216dd526725a5763993d 100644 (file)
--- a/crates/ra_ide_api/src/goto_definition.rs
+++ b/crates/ra_ide_api/src/goto_definition.rs
@@ -1,4 +1,4 @@
-use ra_db::{FileId, FilesDatabase};
+use ra_db::{FileId, SourceDatabase};
 use ra_syntax::{
     AstNode, ast,
     algo::find_node_at_offset,

diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs
index 04f5a746e7fcb5f5e67e3de483ed14caf5d9d980..b6d727399b26835f38110c8daa6fa6cde3ebdb9b 100644 (file)
--- a/crates/ra_ide_api/src/hover.rs
+++ b/crates/ra_ide_api/src/hover.rs
@@ -1,4 +1,4 @@
-use ra_db::FilesDatabase;
+use ra_db::SourceDatabase;
 use ra_syntax::{
     AstNode, SyntaxNode, TreeArc, ast,
     algo::{find_covering_node, find_node_at_offset, find_leaf_at_offset, visit::{visitor, Visitor}},

diff --git a/crates/ra_ide_api/src/imp.rs b/crates/ra_ide_api/src/imp.rs
index f2d41321dc648b9d4a445e2900ce8790935ca0cb..1222fdc4499b1309691d2166f847699b00458c21 100644 (file)
--- a/crates/ra_ide_api/src/imp.rs
+++ b/crates/ra_ide_api/src/imp.rs
@@ -4,7 +4,7 @@
     self, Problem, source_binder
 };
 use ra_db::{
-    FilesDatabase, SourceRoot, SourceRootId,
+    SourceDatabase, SourceRoot, SourceRootId,
     salsa::{Database, SweepStrategy},
 };
 use ra_ide_api_light::{self, assists, LocalEdit, Severity};

diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 8380aa6c294438d027d364802ba9b7e423063861..62a1934f418615554d40e053790bf14af7e4804e 100644 (file)
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -34,7 +34,7 @@
 use ra_syntax::{SourceFile, TreeArc, TextRange, TextUnit};
 use ra_text_edit::TextEdit;
 use ra_db::{
-    FilesDatabase, CheckCanceled,
+    SourceDatabase, CheckCanceled,
     salsa::{self, ParallelDatabase},
 };
 use rayon::prelude::*;

diff --git a/crates/ra_ide_api/src/rename.rs b/crates/ra_ide_api/src/rename.rs
index fe81609df94c2ee8b24857b3f4a07aa0225cbf10..81ca0537c352681bab6817ddd7133891868e383f 100644 (file)
--- a/crates/ra_ide_api/src/rename.rs
+++ b/crates/ra_ide_api/src/rename.rs
@@ -17,7 +17,7 @@
     SourceChange,
     SourceFileEdit,
 };
-use ra_db::FilesDatabase;
+use ra_db::SourceDatabase;
 use relative_path::RelativePath;
 
 pub(crate) fn rename(

diff --git a/crates/ra_ide_api/src/runnables.rs b/crates/ra_ide_api/src/runnables.rs
index e21724207a3610cf5ff5c18d5c67a308c47aa951..0f2d00f13418ffc78dfc02323a19506f2fa51a1b 100644 (file)
--- a/crates/ra_ide_api/src/runnables.rs
+++ b/crates/ra_ide_api/src/runnables.rs
@@ -3,7 +3,7 @@
     TextRange, SyntaxNode,
     ast::{self, AstNode, NameOwner, ModuleItemOwner},
 };
-use ra_db::FilesDatabase;
+use ra_db::SourceDatabase;
 
 use crate::{db::RootDatabase, FileId};
 

diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs
index 4d81d14b3f070f93201d880a8673527d0474a9a1..230ff410eb41266d0ffd6df773098e908a4e3ce9 100644 (file)
--- a/crates/ra_ide_api/src/symbol_index.rs
+++ b/crates/ra_ide_api/src/symbol_index.rs
@@ -34,7 +34,7 @@
     ast::{self, NameOwner},
 };
 use ra_db::{
-    SourceRootId, FilesDatabase,
+    SourceRootId, SourceDatabase,
     salsa::{self, ParallelDatabase},
 };
 use rayon::prelude::*;

diff --git a/crates/ra_ide_api/src/syntax_highlighting.rs b/crates/ra_ide_api/src/syntax_highlighting.rs
index cfa0257dd24d9d0b3102ed02246e30509650915c..16d23e140ec1b4c2aa65687e69c705f509767c11 100644 (file)
--- a/crates/ra_ide_api/src/syntax_highlighting.rs
+++ b/crates/ra_ide_api/src/syntax_highlighting.rs
@@ -1,5 +1,5 @@
 use ra_syntax::{ast, AstNode,};
-use ra_db::FilesDatabase;
+use ra_db::SourceDatabase;
 
 use crate::{
     FileId, HighlightedRange,