itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Open Cargo.toml opens more specific manifest

Browse Source
This commit is contained in:
Aleksey Kladov 2020-12-08 16:28:21 +03:00
parent ecd1c11f9e
commit 944f30bd69
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/rust-analyzer/src/cargo_target_spec.rs
View File

@ -14,6 +14,7 @@ use crate::{global_state::GlobalStateSnapshot, Result};
#[derive(Clone)] #[derive(Clone)]
pub(crate) struct CargoTargetSpec { pub(crate) struct CargoTargetSpec {
pub(crate) workspace_root: AbsPathBuf, pub(crate) workspace_root: AbsPathBuf,
pub(crate) cargo_toml: AbsPathBuf,
pub(crate) package: String, pub(crate) package: String,
pub(crate) target: String, pub(crate) target: String,
pub(crate) target_kind: TargetKind, pub(crate) target_kind: TargetKind,
@ -115,12 +116,17 @@ impl CargoTargetSpec {
Some(it) => it, Some(it) => it,
None => return Ok(None), None => return Ok(None),
}; };
let target_data = &cargo_ws[target];
let package_data = &cargo_ws[target_data.package];
let res = CargoTargetSpec { let res = CargoTargetSpec {
workspace_root: cargo_ws.workspace_root().to_path_buf(), workspace_root: cargo_ws.workspace_root().to_path_buf(),
package: cargo_ws.package_flag(&cargo_ws[cargo_ws[target].package]), cargo_toml: package_data.manifest.clone(),
target: cargo_ws[target].name.clone(), package: cargo_ws.package_flag(&package_data),
target_kind: cargo_ws[target].kind, target: target_data.name.clone(),
target_kind: target_data.kind,
}; };
Ok(Some(res)) Ok(Some(res))
} }

10
crates/rust-analyzer/src/handlers.rs
View File

@ -1342,13 +1342,9 @@ pub(crate) fn handle_open_cargo_toml(
None => return Ok(None), None => return Ok(None),
}; };
let cargo_toml_path = cargo_spec.workspace_root.join("Cargo.toml"); let cargo_toml_url = to_proto::url_from_abs_path(&cargo_spec.cargo_toml);
if !cargo_toml_path.exists() { let res: lsp_types::GotoDefinitionResponse =
return Ok(None); Location::new(cargo_toml_url, Range::default()).into();
}
let cargo_toml_url = to_proto::url_from_abs_path(&cargo_toml_path);
let cargo_toml_location = Location::new(cargo_toml_url, Range::default());
let res = lsp_types::GotoDefinitionResponse::from(cargo_toml_location);
Ok(Some(res)) Ok(Some(res))
} }