language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-13 11:52:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Cleanup

Browse source
This commit is contained in:
Aleksey Kladov 2020-07-09 09:56:15 +02:00
parent 3ef9ef34c6
commit 22269c67b8
1 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/ra_ide/src/hover.rs
View file

@ -1,5 +1,3 @@
use std::iter::once;
use hir::{ use hir::{
Adt, AsAssocItem, AssocItemContainer, Documentation, FieldSource, HasSource, HirDisplay, Adt, AsAssocItem, AssocItemContainer, Documentation, FieldSource, HasSource, HirDisplay,
Module, ModuleDef, ModuleSource, Semantics, Module, ModuleDef, ModuleSource, Semantics,
@ -211,7 +209,11 @@ fn goto_type_action(db: &RootDatabase, def: Definition) -> Option<HoverAction> {
.into_iter() .into_iter()
.filter_map(|it| { .filter_map(|it| {
Some(HoverGotoTypeData { Some(HoverGotoTypeData {
mod_path: mod_path(db, &it)?, mod_path: render_path(
db,
it.module(db)?,
it.name(db).map(|name| name.to_string()),
),
nav: it.try_to_nav(db)?, nav: it.try_to_nav(db)?,
}) })
}) })
@ -253,27 +255,19 @@ fn definition_owner_name(db: &RootDatabase, def: &Definition) -> Option<String>
.map(|name| name.to_string()) .map(|name| name.to_string())
} }
fn determine_mod_path(db: &RootDatabase, module: Module, name: Option<String>) -> String { fn render_path(db: &RootDatabase, module: Module, item_name: Option<String>) -> String {
once(db.crate_graph()[module.krate().into()].display_name.as_ref().map(ToString::to_string)) let crate_name =
.chain( db.crate_graph()[module.krate().into()].display_name.as_ref().map(ToString::to_string);
module let module_path = module
.path_to_root(db) .path_to_root(db)
.into_iter() .into_iter()
.rev() .rev()
.map(|it| it.name(db).map(|name| name.to_string())), .flat_map(|it| it.name(db).map(|name| name.to_string()));
) crate_name.into_iter().chain(module_path).chain(item_name).join("::")
.chain(once(name))
.flatten()
.join("::")
}
// returns None only for ModuleDef::BuiltinType
fn mod_path(db: &RootDatabase, item: &ModuleDef) -> Option<String> {
Some(determine_mod_path(db, item.module(db)?, item.name(db).map(|name| name.to_string())))
} }
fn definition_mod_path(db: &RootDatabase, def: &Definition) -> Option<String> { 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| render_path(db, module, definition_owner_name(db, def)))
} }
fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<String> { fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<String> {