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

Accept relative paths in rust-project.json

Browse Source 
If a relative path is found as part of Crate.root_module or Root.path,
interpret it as relative to the location of the rust-project.json file.
This commit is contained in:
Thiébaud Weksteen
2020-06-09 21:26:42 +02:00
parent 017331a53c
commit 44f28f65af
4 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/rust-analyzer/src/bin/main.rs
View File

@@ -108,11 +108,11 @@ fn run_server() -> Result<()> {
config.update(value);
}
config.update_caps(&initialize_params.capabilities);
let cwd = std::env::current_dir()?;
config.root_path =
initialize_params.root_uri.and_then(|it| it.to_file_path().ok()).unwrap_or(cwd);
if config.linked_projects.is_empty() {
let cwd = std::env::current_dir()?;
let root =
initialize_params.root_uri.and_then(|it| it.to_file_path().ok()).unwrap_or(cwd);
let workspace_roots = initialize_params
.workspace_folders
.map(|workspaces| {
@@ -122,7 +122,7 @@ fn run_server() -> Result<()> {
.collect::<Vec<_>>()
})
.filter(|workspaces| !workspaces.is_empty())
.unwrap_or_else(|| vec![root]);
.unwrap_or_else(|| vec![config.root_path.clone()]);
config.linked_projects = ProjectManifest::discover_all(&workspace_roots)
.into_iter()