mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: compare pkg via manifest

Browse Source
This commit is contained in:
rainy-me 2021-10-07 23:44:25 +09:00
parent 39044fe39c
commit aaa0771719
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,6 @@ use project_model::{ProjectWorkspace, TargetKind};
use serde_json::json;
use stdx::{format_to, never};
use syntax::{algo, ast, AstNode, TextRange, TextSize, T};
use vfs::AbsPath;
use crate::{
cargo_target_spec::CargoTargetSpec,
@ -615,21 +614,7 @@ pub(crate) fn handle_parent_module(
.filter_map(|ws| match ws {
ProjectWorkspace::Cargo { cargo, .. } => cargo
.packages()
.find(|&pkg| {
cargo[pkg]
.targets
.iter()
.find_map(|&it| {
let pkg_parent_path = cargo[it].root.parent()?;
let file_parent_path = AbsPath::assert(file_path.parent()?);
if pkg_parent_path == file_parent_path {
Some(())
} else {
None
}
})
.is_some()
})
.find(|&pkg| cargo[pkg].manifest.as_ref() == file_path)
.and_then(|_| Some(cargo)),
_ => None,
})