language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 22:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rename FilesDatabase -> SourceDatabase

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-26 11:20:30 +03:00
parent 3223de5976
commit 4711cbcace
17 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ra_ide_api/src/db.rs
View file

@ -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 @@ impl AsRef<hir::HirInterner> for RootDatabase {
}
#[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))
}