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

fold syntax database into files database

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-26 11:09:39 +03:00
parent 2f270a51d2
commit be1a005ebd
15 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
use std::sync::Arc;
use ra_db::{
BaseDatabase, FileId, Canceled,
CheckCanceled, FileId, Canceled,
salsa::{self, Database},
};
@ -9,7 +9,6 @@ use crate::{symbol_index, LineIndex};
#[salsa::database(
ra_db::FilesDatabaseStorage,
ra_db::SyntaxDatabaseStorage,
LineIndexDatabaseStorage,
symbol_index::SymbolsDatabaseStorage,
hir::db::HirDatabaseStorage
@ -54,7 +53,7 @@ impl salsa::ParallelDatabase for RootDatabase {
}
}
impl BaseDatabase for RootDatabase {}
impl CheckCanceled for RootDatabase {}
impl AsRef<hir::HirInterner> for RootDatabase {
fn as_ref(&self) -> &hir::HirInterner {
@ -63,7 +62,7 @@ impl AsRef<hir::HirInterner> for RootDatabase {
}
#[salsa::query_group(LineIndexDatabaseStorage)]
pub(crate) trait LineIndexDatabase: ra_db::FilesDatabase + BaseDatabase {
pub(crate) trait LineIndexDatabase: ra_db::FilesDatabase + CheckCanceled {
fn line_index(&self, file_id: FileId) -> Arc<LineIndex>;
}