Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-16 09:48:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Slightly more robust cargo watcher root search

Browse source
This commit is contained in:
Emil Lauridsen 2020-01-10 22:10:26 +01:00
parent 19eb7fa1db
commit 1d1eea217d
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/ra_lsp_server/src/world.rs
View file

@ -74,7 +74,7 @@ impl WorldState {
lru_capacity: Option<usize>, lru_capacity: Option<usize>,
exclude_globs: &[Glob], exclude_globs: &[Glob],
watch: Watch, watch: Watch,
options: Options, mut options: Options,
feature_flags: FeatureFlags, feature_flags: FeatureFlags,
) -> WorldState { ) -> WorldState {
let mut change = AnalysisChange::new(); let mut change = AnalysisChange::new();
@ -132,8 +132,20 @@ impl WorldState {
change.set_crate_graph(crate_graph); change.set_crate_graph(crate_graph);
// FIXME: Figure out the multi-workspace situation // FIXME: Figure out the multi-workspace situation
let check_watcher = let check_watcher = {
CheckWatcher::new(&options.cargo_watch, folder_roots.first().cloned().unwrap()); let first_workspace = workspaces.first().unwrap();
let cargo_project_root = match first_workspace {
ProjectWorkspace::Cargo { cargo, .. } => cargo.workspace_root.clone(),
ProjectWorkspace::Json { .. } => {
log::warn!(
"Cargo check watching only supported for cargo workspaces, disabling"
);
options.cargo_watch.enable = false;
PathBuf::new()
}
};
CheckWatcher::new(&options.cargo_watch, cargo_project_root)
};
let mut analysis_host = AnalysisHost::new(lru_capacity, feature_flags); let mut analysis_host = AnalysisHost::new(lru_capacity, feature_flags);
analysis_host.apply_change(change); analysis_host.apply_change(change);

2
crates/ra_project_model/src/cargo_workspace.rs
View file

@ -21,7 +21,7 @@ use crate::Result;
pub struct CargoWorkspace { pub struct CargoWorkspace {
packages: Arena<Package, PackageData>, packages: Arena<Package, PackageData>,
targets: Arena<Target, TargetData>, targets: Arena<Target, TargetData>,
pub(crate) workspace_root: PathBuf, pub workspace_root: PathBuf,
} }
#[derive(Deserialize, Clone, Debug, PartialEq, Eq)] #[derive(Deserialize, Clone, Debug, PartialEq, Eq)]