Better encapsulate reverse-mapping of files to cargo targets

We need to find a better way to do it...

CrateGraph by itself is fine, CargoWorkspace as well, but the mapping
between the two seems arbitrary...

1 files changed, 14 insertions, 18 deletions

diff --git a/crates/rust-analyzer/src/cargo_target_spec.rs b/crates/rust-analyzer/src/cargo_target_spec.rs
index 44f856f6b..5c22dce0d 100644
--- a/crates/rust-analyzer/src/cargo_target_spec.rs
+++ b/crates/rust-analyzer/src/cargo_target_spec.rs
@@ -2,7 +2,7 @@
 
 use ra_cfg::CfgExpr;
 use ra_ide::{FileId, RunnableKind, TestId};
-use ra_project_model::{self, ProjectWorkspace, TargetKind};
+use ra_project_model::{self, TargetKind};
 
 use crate::{global_state::GlobalStateSnapshot, Result};
 
@@ -89,27 +89,23 @@ impl CargoTargetSpec {
     }
 
     pub(crate) fn for_file(
-        world: &GlobalStateSnapshot,
+        global_state_snapshot: &GlobalStateSnapshot,
         file_id: FileId,
     ) -> Result<Option<CargoTargetSpec>> {
-        let &crate_id = match world.analysis().crate_for(file_id)?.first() {
-            Some(crate_id) => crate_id,
+        let crate_id = match global_state_snapshot.analysis().crate_for(file_id)?.first() {
+            Some(crate_id) => *crate_id,
             None => return Ok(None),
         };
-        let file_id = world.analysis().crate_root(crate_id)?;
-        let path = world.file_id_to_path(file_id);
-        let res = world.workspaces.iter().find_map(|ws| match ws {
-            ProjectWorkspace::Cargo { cargo, .. } => {
-                let tgt = cargo.target_by_root(&path)?;
-                Some(CargoTargetSpec {
-                    package: cargo.package_flag(&cargo[cargo[tgt].package]),
-                    target: cargo[tgt].name.clone(),
-                    target_kind: cargo[tgt].kind,
-                })
-            }
-            ProjectWorkspace::Json { .. } => None,
-        });
-        Ok(res)
+        let (cargo_ws, target) = match global_state_snapshot.cargo_target_for_crate_root(crate_id) {
+            Some(it) => it,
+            None => return Ok(None),
+        };
+        let res = CargoTargetSpec {
+            package: cargo_ws.package_flag(&cargo_ws[cargo_ws[target].package]),
+            target: cargo_ws[target].name.clone(),
+            target_kind: cargo_ws[target].kind,
+        };
+        Ok(Some(res))
     }
 
     pub(crate) fn push_to(self, buf: &mut Vec<String>, kind: &RunnableKind) {