rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename

Browse Source
This commit is contained in:
Aleksey Kladov
2020-07-09 09:39:53 +02:00
parent a61c848157
commit ed12bd2791
1 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
crates/ra_ide/src/hover.rs
View File

@@ -102,18 +102,13 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
let node = token.parent(); let node = token.parent();
let definition = match_ast! { let definition = match_ast! {
match node { match node {
ast::NameRef(name_ref) => { ast::NameRef(name_ref) => classify_name_ref(&sema, &name_ref).map(|d| d.definition()),
classify_name_ref(&sema, &name_ref).map(|d| d.definition()) ast::Name(name) => classify_name(&sema, &name).map(|d| d.definition()),
},
ast::Name(name) => {
classify_name(&sema, &name).map(|d| d.definition())
},
_ => None, _ => None,
} }
}; };
if let Some(definition) = definition { if let Some(definition) = definition {
let range = sema.original_range(&node).range; if let Some(text) = hover_for_definition(db, definition) {
if let Some(text) = hover_text_from_name_kind(db, definition) {
res.markup.push_section(&text); res.markup.push_section(&text);
} }
if !res.is_empty() { if !res.is_empty() {
@@ -129,6 +124,7 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
res.push_action(action); res.push_action(action);
} }
let range = sema.original_range(&node).range;
return Some(RangeInfo::new(range, res)); return Some(RangeInfo::new(range, res));
} }
} }
@@ -139,20 +135,14 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
let ty = match_ast! { let ty = match_ast! {
match node { match node {
ast::MacroCall(_it) => { ast::Expr(it) => sema.type_of_expr(&it)?,
// If this node is a MACRO_CALL, it means that `descend_into_macros` failed to resolve. ast::Pat(it) => sema.type_of_pat(&it)?,
// (e.g expanding a builtin macro). So we give up here. // If this node is a MACRO_CALL, it means that `descend_into_macros` failed to resolve.
return None; // (e.g expanding a builtin macro). So we give up here.
}, ast::MacroCall(_it) => return None,
ast::Expr(it) => { _ => return None,
sema.type_of_expr(&it)
},
ast::Pat(it) => {
sema.type_of_pat(&it)
},
_ => None,
} }
}?; };
res.markup.push_section(&rust_code_markup(&ty.display(db))); res.markup.push_section(&rust_code_markup(&ty.display(db)));
let range = sema.original_range(&node).range; let range = sema.original_range(&node).range;
@@ -300,7 +290,7 @@ fn definition_mod_path(db: &RootDatabase, def: &Definition) -> Option<String> {
def.module(db).map(|module| determine_mod_path(db, module, definition_owner_name(db, def))) def.module(db).map(|module| determine_mod_path(db, module, definition_owner_name(db, def)))
} }
fn hover_text_from_name_kind(db: &RootDatabase, def: Definition) -> Option<String> { fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<String> {
let mod_path = definition_mod_path(db, &def); let mod_path = definition_mod_path(db, &def);
return match def { return match def {
Definition::Macro(it) => { Definition::Macro(it) => {