rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: potential bugs when build scripts do not match the current project

Browse Source
This commit is contained in:
Aleksey Kladov
2021-07-18 13:13:03 +03:00
parent f4de2ece0d
commit b8b166e674
4 changed files with 173 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/rust-analyzer/src/cli/load_cargo.rs
View File

@@ -36,7 +36,7 @@ pub(crate) fn load_workspace_at(
}
fn load_workspace(
ws: ProjectWorkspace,
mut ws: ProjectWorkspace,
cargo_config: &CargoConfig,
load_config: &LoadCargoConfig,
progress: &dyn Fn(String),
@@ -56,22 +56,20 @@ fn load_workspace(
None
};
let build_scripts = match &ws {
ProjectWorkspace::Cargo { cargo, .. } if load_config.load_out_dirs_from_check => {
WorkspaceBuildScripts::run(cargo_config, cargo, progress)?
}
_ => WorkspaceBuildScripts::default(),
};
ws.set_build_scripts(if load_config.load_out_dirs_from_check {
ws.run_build_scripts(cargo_config, progress)?
} else {
WorkspaceBuildScripts::default()
});
let crate_graph =
ws.to_crate_graph(&build_scripts, proc_macro_client.as_ref(), &mut |path: &AbsPath| {
let contents = loader.load_sync(path);
let path = vfs::VfsPath::from(path.to_path_buf());
vfs.set_file_contents(path.clone(), contents);
vfs.file_id(&path)
});
let crate_graph = ws.to_crate_graph(proc_macro_client.as_ref(), &mut |path: &AbsPath| {
let contents = loader.load_sync(path);
let path = vfs::VfsPath::from(path.to_path_buf());
vfs.set_file_contents(path.clone(), contents);
vfs.file_id(&path)
});
let project_folders = ProjectFolders::new(&[ws], &[build_scripts], &[]);
let project_folders = ProjectFolders::new(&[ws], &[]);
loader.set_config(vfs::loader::Config {
load: project_folders.load,
watch: vec![],