language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

minor: hover_simple refactor

Browse source
This commit is contained in:
DaniPopes 2023-09-24 22:47:29 +02:00
parent e5e937ae5e
commit 588c7d9182
No known key found for this signature in database
GPG key ID: 0F09640DDB7AC692
3 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/ide/src/hover.rs
View file

@ -180,26 +180,24 @@ fn hover_simple(
descended()
.filter_map(|token| {
let node = token.parent()?;
let class = IdentClass::classify_token(sema, token)?;
if let IdentClass::Operator(OperatorClass::Await(_)) = class {
match IdentClass::classify_node(sema, &node)? {
// It's better for us to fall back to the keyword hover here,
// rendering poll is very confusing
return None;
IdentClass::Operator(OperatorClass::Await(_)) => None,
IdentClass::NameRefClass(NameRefClass::ExternCrateShorthand {
decl,
..
}) => Some(vec![(Definition::ExternCrateDecl(decl), node)]),
class => Some(
class
.definitions()
.into_iter()
.zip(iter::repeat(node))
.collect::<Vec<_>>(),
),
}
if let IdentClass::NameRefClass(NameRefClass::ExternCrateShorthand {
decl,
..
}) = class
{
return Some(vec![(Definition::ExternCrateDecl(decl), node)]);
}
Some(
class
.definitions()
.into_iter()
.zip(iter::once(node).cycle())
.collect::<Vec<_>>(),
)
})
.flatten()
.unique_by(|&(def, _)| def)