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

Cleanup runnables canonical path impl

Browse source
This commit is contained in:
Lukas Wirth 2021-07-20 16:00:44 +02:00
parent 97d63d67cd
commit 113beab473
2 changed files with 49 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/hir/src/lib.rs
View file

@ -295,12 +295,12 @@ impl ModuleDef {
} }
pub fn canonical_path(&self, db: &dyn HirDatabase) -> Option<String> { pub fn canonical_path(&self, db: &dyn HirDatabase) -> Option<String> {
let mut segments = vec![self.name(db)?.to_string()]; let mut segments = vec![self.name(db)?];
for m in self.module(db)?.path_to_root(db) { for m in self.module(db)?.path_to_root(db) {
segments.extend(m.name(db).map(|it| it.to_string())) segments.extend(m.name(db))
} }
segments.reverse(); segments.reverse();
Some(segments.join("::")) Some(segments.into_iter().join("::"))
} }
pub fn name(self, db: &dyn HirDatabase) -> Option<Name> { pub fn name(self, db: &dyn HirDatabase) -> Option<Name> {

94
crates/ide/src/runnables.rs
View file

@ -157,7 +157,7 @@ pub(crate) fn runnables(db: &RootDatabase, file_id: FileId) -> Vec<Runnable> {
hir::ModuleDef::Function(it) => runnable_fn(&sema, it), hir::ModuleDef::Function(it) => runnable_fn(&sema, it),
_ => None, _ => None,
}; };
add_opt(runnable.or_else(|| module_def_doctest(&sema, def)), Some(def)); add_opt(runnable.or_else(|| module_def_doctest(sema.db, def)), Some(def));
} }
Either::Right(impl_) => { Either::Right(impl_) => {
add_opt(runnable_impl(&sema, &impl_), None); add_opt(runnable_impl(&sema, &impl_), None);
@ -168,9 +168,9 @@ pub(crate) fn runnables(db: &RootDatabase, file_id: FileId) -> Vec<Runnable> {
( (
match assoc { match assoc {
hir::AssocItem::Function(it) => runnable_fn(&sema, it) hir::AssocItem::Function(it) => runnable_fn(&sema, it)
.or_else(|| module_def_doctest(&sema, it.into())), .or_else(|| module_def_doctest(sema.db, it.into())),
hir::AssocItem::Const(it) => module_def_doctest(&sema, it.into()), hir::AssocItem::Const(it) => module_def_doctest(sema.db, it.into()),
hir::AssocItem::TypeAlias(it) => module_def_doctest(&sema, it.into()), hir::AssocItem::TypeAlias(it) => module_def_doctest(sema.db, it.into()),
}, },
assoc, assoc,
) )
@ -382,61 +382,59 @@ fn runnable_mod_outline_definition(
} }
} }
fn module_def_doctest(sema: &Semantics<RootDatabase>, def: hir::ModuleDef) -> Option<Runnable> { fn module_def_doctest(db: &RootDatabase, def: hir::ModuleDef) -> Option<Runnable> {
let attrs = match def { let attrs = match def {
hir::ModuleDef::Module(it) => it.attrs(sema.db), hir::ModuleDef::Module(it) => it.attrs(db),
hir::ModuleDef::Function(it) => it.attrs(sema.db), hir::ModuleDef::Function(it) => it.attrs(db),
hir::ModuleDef::Adt(it) => it.attrs(sema.db), hir::ModuleDef::Adt(it) => it.attrs(db),
hir::ModuleDef::Variant(it) => it.attrs(sema.db), hir::ModuleDef::Variant(it) => it.attrs(db),
hir::ModuleDef::Const(it) => it.attrs(sema.db), hir::ModuleDef::Const(it) => it.attrs(db),
hir::ModuleDef::Static(it) => it.attrs(sema.db), hir::ModuleDef::Static(it) => it.attrs(db),
hir::ModuleDef::Trait(it) => it.attrs(sema.db), hir::ModuleDef::Trait(it) => it.attrs(db),
hir::ModuleDef::TypeAlias(it) => it.attrs(sema.db), hir::ModuleDef::TypeAlias(it) => it.attrs(db),
hir::ModuleDef::BuiltinType(_) => return None, hir::ModuleDef::BuiltinType(_) => return None,
}; };
if !has_runnable_doc_test(&attrs) { if !has_runnable_doc_test(&attrs) {
return None; return None;
} }
let def_name = def.name(sema.db).map(|it| it.to_string()); let def_name = def.name(db)?;
let test_id = def let path = (|| {
.canonical_path(sema.db) let mut path = String::new();
// This probably belongs to canonical path? def.module(db)?
.map(|path| { .path_to_root(db)
let assoc_def = match def { .into_iter()
hir::ModuleDef::Function(it) => it.as_assoc_item(sema.db), .rev()
hir::ModuleDef::Const(it) => it.as_assoc_item(sema.db), .flat_map(|it| it.name(db))
hir::ModuleDef::TypeAlias(it) => it.as_assoc_item(sema.db), .for_each(|name| format_to!(path, "{}::", name));
_ => None, // This probably belongs to canonical_path?
}; if let Some(assoc_item) = def.as_assoc_item(db) {
// FIXME: this also looks very wrong if let hir::AssocItemContainer::Impl(imp) = assoc_item.container(db) {
if let Some(assoc_def) = assoc_def { let ty = imp.self_ty(db);
if let hir::AssocItemContainer::Impl(imp) = assoc_def.container(sema.db) { if let Some(adt) = ty.as_adt() {
let ty = imp.self_ty(sema.db); let name = adt.name(db);
if let Some(adt) = ty.as_adt() { let mut ty_args = ty.type_arguments().peekable();
let name = adt.name(sema.db); format_to!(path, "{}", name);
let idx = path.rfind(':').map_or(0, |idx| idx + 1); if ty_args.peek().is_some() {
let (prefix, suffix) = path.split_at(idx); format_to!(
let mut ty_args = ty.type_arguments().peekable(); path,
let params = if ty_args.peek().is_some() { "<{}>",
format!( ty_args.format_with(", ", |ty, cb| cb(&ty.display(db)))
"<{}>", );
ty_args.format_with(", ", |ty, cb| cb(&ty.display(sema.db)))
)
} else {
String::new()
};
return format!("{}{}{}::{}", prefix, name, params, suffix);
} }
format_to!(path, "::{}", def_name);
return Some(path);
} }
} }
path }
}) format_to!(path, "{}", def_name);
.map(TestId::Path) Some(path)
.or_else(|| def_name.clone().map(TestId::Name))?; })();
let test_id = path.map_or_else(|| TestId::Name(def_name.to_string()), TestId::Path);
let mut nav = match def { let mut nav = match def {
hir::ModuleDef::Module(def) => NavigationTarget::from_module_to_decl(sema.db, def), hir::ModuleDef::Module(def) => NavigationTarget::from_module_to_decl(db, def),
def => def.try_to_nav(sema.db)?, def => def.try_to_nav(db)?,
}; };
nav.focus_range = None; nav.focus_range = None;
nav.description = None; nav.description = None;