language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

⬆️ salsa

Browse source
This commit is contained in:
Aleksey Kladov 2018-10-31 00:59:43 +03:00
parent d10214581e
commit 23cad90fe9
4 changed files with 40 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_analysis/Cargo.toml
View file

@ -11,7 +11,7 @@ rayon = "1.0.2"
fst = "0.3.1"
ra_syntax = { path = "../ra_syntax" }
ra_editor = { path = "../ra_editor" }
salsa = "0.6.2"
salsa = "0.7.0"
rustc-hash = "1.0"
[dev-dependencies]

9
crates/ra_analysis/src/imp.rs
View file

@ -84,7 +84,7 @@ impl Default for FileResolverImp {
}
}
#[derive(Debug, Default)]
#[derive(Debug)]
pub(crate) struct AnalysisHostImpl {
db: db::RootDatabase,
}
@ -92,7 +92,12 @@ pub(crate) struct AnalysisHostImpl {
impl AnalysisHostImpl {
pub fn new() -> AnalysisHostImpl {
AnalysisHostImpl::default()
let db = db::RootDatabase::default();
db.query(crate::input::SourceRootQuery)
.set(WORKSPACE, Default::default());
db.query(crate::input::CrateGraphQuery)
.set((), Default::default());
AnalysisHostImpl { db }
}
pub fn analysis(&self) -> AnalysisImpl {
AnalysisImpl {

4
crates/ra_analysis/src/input.rs
View file

@ -67,10 +67,10 @@ salsa::query_group! {
}
}
#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub(crate) struct SourceRootId(pub(crate) u32);
#[derive(Clone, Default, Debug, PartialEq, Eq)]
#[derive(Default, Clone, Debug, PartialEq, Eq)]
pub(crate) struct SourceRoot {
pub(crate) file_resolver: FileResolverImp,
pub(crate) files: FxHashSet<FileId>,