Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/project-model/src/workspace.rs')
| -rw-r--r-- | crates/project-model/src/workspace.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs index a4e184502d..62dc94f99c 100644 --- a/crates/project-model/src/workspace.rs +++ b/crates/project-model/src/workspace.rs @@ -199,7 +199,8 @@ impl ProjectWorkspace { let data = serde_json::from_str(&file) .with_context(|| format!("Failed to deserialize json file {project_json}"))?; let project_location = project_json.parent().to_path_buf(); - let project_json: ProjectJson = ProjectJson::new(&project_location, data); + let project_json: ProjectJson = + ProjectJson::new(Some(project_json.clone()), &project_location, data); ProjectWorkspace::load_inline( project_json, config.target.as_deref(), @@ -555,7 +556,7 @@ impl ProjectWorkspace { pub fn manifest_or_root(&self) -> &AbsPath { match &self.kind { ProjectWorkspaceKind::Cargo { cargo, .. } => cargo.manifest_path(), - ProjectWorkspaceKind::Json(project) => project.path(), + ProjectWorkspaceKind::Json(project) => project.manifest_or_root(), ProjectWorkspaceKind::DetachedFile { file, .. } => file, } } |