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

add sysroot boilerplate

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-10 20:13:08 +03:00
parent b6bc55f542
commit e8923713c5
6 changed files with 157 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/ra_lsp_server/src/server_world.rs
View file

@ -15,7 +15,7 @@ use parking_lot::RwLock;
use failure::format_err;
use crate::{
project_model::{CargoWorkspace, TargetKind},
project_model::{ProjectWorkspace, TargetKind},
Result,
};
@ -23,26 +23,26 @@ use crate::{
pub struct ServerWorldState {
pub roots_to_scan: usize,
pub root: PathBuf,
pub workspaces: Arc<Vec<CargoWorkspace>>,
pub workspaces: Arc<Vec<ProjectWorkspace>>,
pub analysis_host: AnalysisHost,
pub vfs: Arc<RwLock<Vfs>>,
}
pub struct ServerWorld {
pub workspaces: Arc<Vec<CargoWorkspace>>,
pub workspaces: Arc<Vec<ProjectWorkspace>>,
pub analysis: Analysis,
pub vfs: Arc<RwLock<Vfs>>,
}
impl ServerWorldState {
pub fn new(root: PathBuf, workspaces: Vec<CargoWorkspace>) -> ServerWorldState {
pub fn new(root: PathBuf, workspaces: Vec<ProjectWorkspace>) -> ServerWorldState {
let mut change = AnalysisChange::new();
let mut roots = Vec::new();
roots.push(root.clone());
for ws in workspaces.iter() {
for pkg in ws.packages() {
roots.push(pkg.root(&ws).to_path_buf());
for pkg in ws.cargo.packages() {
roots.push(pkg.root(&ws.cargo).to_path_buf());
}
}
let roots_to_scan = roots.len();
@ -56,13 +56,13 @@ impl ServerWorldState {
let mut pkg_to_lib_crate = FxHashMap::default();
let mut pkg_crates = FxHashMap::default();
for ws in workspaces.iter() {
for pkg in ws.packages() {
for tgt in pkg.targets(ws) {
let root = tgt.root(ws);
for pkg in ws.cargo.packages() {
for tgt in pkg.targets(&ws.cargo) {
let root = tgt.root(&ws.cargo);
if let Some(file_id) = vfs.load(root) {
let file_id = FileId(file_id.0.into());
let crate_id = crate_graph.add_crate_root(file_id);
if tgt.kind(ws) == TargetKind::Lib {
if tgt.kind(&ws.cargo) == TargetKind::Lib {
pkg_to_lib_crate.insert(pkg, crate_id);
}
pkg_crates
@ -72,8 +72,8 @@ impl ServerWorldState {
}
}
}
for pkg in ws.packages() {
for dep in pkg.dependencies(ws) {
for pkg in ws.cargo.packages() {
for dep in pkg.dependencies(&ws.cargo) {
if let Some(&to) = pkg_to_lib_crate.get(&dep.pkg) {
for &from in pkg_crates.get(&pkg).into_iter().flatten() {
crate_graph.add_dep(from, dep.name.clone(), to);