Skip to content

fix: keyword hover works on non-keyword tokens if expanded to keyword #11480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 15, 2022
Merged

fix: keyword hover works on non-keyword tokens if expanded to keyword #11480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions crates/ide/src/hover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,10 @@ pub(crate) fn hover(
let sema = &hir::Semantics::new(db);
let file = sema.parse(file_id).syntax().clone();

let offset = if !range.is_empty() {
if !range.is_empty() {
return hover_ranged(&file, range, sema, config);
} else {
range.start()
};
}
let offset = range.start();

let original_token = pick_best_token(file.token_at_offset(offset), |kind| match kind {
IDENT | INT_NUMBER | LIFETIME_IDENT | T![self] | T![super] | T![crate] => 3,
Expand All @@ -118,10 +117,11 @@ pub(crate) fn hover(
let descended = sema.descend_into_macros(original_token.clone());

// FIXME: Definition should include known lints and the like instead of having this special case here
if let Some(res) = descended.iter().find_map(|token| {
let hovered_lint = descended.iter().find_map(|token| {
let attr = token.ancestors().find_map(ast::Attr::cast)?;
render::try_for_lint(&attr, token)
}) {
});
if let Some(res) = hovered_lint {
return Some(RangeInfo::new(original_token.text_range(), res));
}

Expand All @@ -143,7 +143,9 @@ pub(crate) fn hover(

if result.is_none() {
// fallbacks, show keywords or types
if let Some(res) = render::keyword(sema, config, &original_token) {

let res = descended.iter().find_map(|token| render::keyword(sema, config, &token));
if let Some(res) = res {
return Some(RangeInfo::new(original_token.text_range(), res));
}
let res = descended
Expand Down Expand Up @@ -199,6 +201,7 @@ fn hover_ranged(
sema: &Semantics<RootDatabase>,
config: &HoverConfig,
) -> Option<RangeInfo<HoverResult>> {
// FIXME: make this work in attributes
let expr_or_pat = file.covering_element(range).ancestors().find_map(|it| {
match_ast! {
match it {
Expand Down