From 8d305680e6560debaf7868c160112e07a7bea8a0 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Tue, 2 Mar 2021 14:41:01 +0100 Subject: Show docs on hover for keywords and primitives --- crates/hir/src/lib.rs | 11 +- crates/ide/src/hover.rs | 135 ++++++++++++++++++++--- crates/ide_db/src/helpers.rs | 4 + crates/ide_db/src/helpers/famous_defs_fixture.rs | 8 ++ 4 files changed, 139 insertions(+), 19 deletions(-) diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 769945c47..69fcdab07 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -33,11 +33,11 @@ mod has_source; pub use crate::{ attrs::{HasAttrs, Namespace}, code_model::{ - Access, Adt, AsAssocItem, AssocItem, AssocItemContainer, Callable, CallableKind, Const, - ConstParam, Crate, CrateDependency, DefWithBody, Enum, Field, FieldSource, Function, - GenericDef, GenericParam, HasVisibility, Impl, Label, LifetimeParam, Local, MacroDef, - Module, ModuleDef, ScopeDef, Static, Struct, Trait, Type, TypeAlias, TypeParam, Union, - Variant, VariantDef, + Access, Adt, AsAssocItem, AssocItem, AssocItemContainer, BuiltinType, Callable, + CallableKind, Const, ConstParam, Crate, CrateDependency, DefWithBody, Enum, Field, + FieldSource, Function, GenericDef, GenericParam, HasVisibility, Impl, Label, LifetimeParam, + Local, MacroDef, Module, ModuleDef, ScopeDef, Static, Struct, Trait, Type, TypeAlias, + TypeParam, Union, Variant, VariantDef, }, has_source::HasSource, semantics::{PathResolution, Semantics, SemanticsScope}, @@ -47,7 +47,6 @@ pub use hir_def::{ adt::StructKind, attr::{Attrs, Documentation}, body::scope::ExprScopes, - builtin_type::BuiltinType, find_path::PrefixKind, import_map, item_scope::ItemInNs, diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index 20b799490..a9454cfa3 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs @@ -5,6 +5,7 @@ use hir::{ use ide_db::{ base_db::SourceDatabase, defs::{Definition, NameClass, NameRefClass}, + helpers::FamousDefs, RootDatabase, }; use itertools::Itertools; @@ -107,16 +108,14 @@ pub(crate) fn hover( } }; if let Some(definition) = definition { - if let Some(markup) = hover_for_definition(db, definition) { - let markup = markup.as_str(); - let markup = if !markdown { - remove_markdown(markup) - } else if links_in_hover { - rewrite_links(db, markup, &definition) - } else { - remove_links(markup) - }; - res.markup = Markup::from(markup); + let famous_defs = match &definition { + Definition::ModuleDef(ModuleDef::BuiltinType(_)) => { + Some(FamousDefs(&sema, sema.scope(&node).krate())) + } + _ => None, + }; + if let Some(markup) = hover_for_definition(db, definition, famous_defs.as_ref()) { + res.markup = process_markup(sema.db, definition, &markup, links_in_hover, markdown); if let Some(action) = show_implementations_action(db, definition) { res.actions.push(action); } @@ -138,6 +137,9 @@ pub(crate) fn hover( // don't highlight the entire parent node on comment hover return None; } + if let res @ Some(_) = hover_for_keyword(&sema, links_in_hover, markdown, &token) { + return res; + } let node = token .ancestors() @@ -272,6 +274,24 @@ fn hover_markup( } } +fn process_markup( + db: &RootDatabase, + def: Definition, + markup: &Markup, + links_in_hover: bool, + markdown: bool, +) -> Markup { + let markup = markup.as_str(); + let markup = if !markdown { + remove_markdown(markup) + } else if links_in_hover { + rewrite_links(db, markup, &def) + } else { + remove_links(markup) + }; + Markup::from(markup) +} + fn definition_owner_name(db: &RootDatabase, def: &Definition) -> Option { match def { Definition::Field(f) => Some(f.parent_def(db).name(db)), @@ -304,7 +324,11 @@ fn definition_mod_path(db: &RootDatabase, def: &Definition) -> Option { def.module(db).map(|module| render_path(db, module, definition_owner_name(db, def))) } -fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option { +fn hover_for_definition( + db: &RootDatabase, + def: Definition, + famous_defs: Option<&FamousDefs>, +) -> Option { let mod_path = definition_mod_path(db, &def); return match def { Definition::Macro(it) => { @@ -339,7 +363,9 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option { ModuleDef::Static(it) => from_def_source(db, it, mod_path), ModuleDef::Trait(it) => from_def_source(db, it, mod_path), ModuleDef::TypeAlias(it) => from_def_source(db, it, mod_path), - ModuleDef::BuiltinType(it) => Some(Markup::fenced_block(&it.name())), + ModuleDef::BuiltinType(it) => famous_defs + .and_then(|fd| hover_for_builtin(fd, it)) + .or_else(|| Some(Markup::fenced_block(&it.name()))), }, Definition::Local(it) => Some(Markup::fenced_block(&it.ty(db).display(db))), Definition::SelfType(impl_def) => { @@ -380,11 +406,52 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option { } } +fn hover_for_keyword( + sema: &Semantics, + links_in_hover: bool, + markdown: bool, + token: &SyntaxToken, +) -> Option> { + if !token.kind().is_keyword() { + return None; + } + let famous_defs = FamousDefs(&sema, sema.scope(&token.parent()).krate()); + // std exposes {}_keyword modules with docstrings on the root to document keywords + let keyword_mod = format!("{}_keyword", token.text()); + let doc_owner = find_std_module(&famous_defs, &keyword_mod)?; + let docs = doc_owner.attrs(sema.db).docs()?; + let markup = process_markup( + sema.db, + Definition::ModuleDef(doc_owner.into()), + &hover_markup(Some(docs.into()), Some(token.text().into()), None)?, + links_in_hover, + markdown, + ); + Some(RangeInfo::new(token.text_range(), HoverResult { markup, actions: Default::default() })) +} + +fn hover_for_builtin(famous_defs: &FamousDefs, builtin: hir::BuiltinType) -> Option { + // std exposes prim_{} modules with docstrings on the root to document the builtins + let primitive_mod = format!("prim_{}", builtin.name()); + let doc_owner = find_std_module(famous_defs, &primitive_mod)?; + let docs = doc_owner.attrs(famous_defs.0.db).docs()?; + hover_markup(Some(docs.into()), Some(builtin.name().to_string()), None) +} + +fn find_std_module(famous_defs: &FamousDefs, name: &str) -> Option { + let db = famous_defs.0.db; + let std_crate = famous_defs.std()?; + let std_root_module = std_crate.root_module(db); + std_root_module + .children(db) + .find(|module| module.name(db).map_or(false, |module| module.to_string() == name)) +} + fn pick_best(tokens: TokenAtOffset) -> Option { return tokens.max_by_key(priority); fn priority(n: &SyntaxToken) -> usize { match n.kind() { - IDENT | INT_NUMBER | LIFETIME_IDENT | T![self] => 3, + IDENT | INT_NUMBER | LIFETIME_IDENT | T![self] | T![super] | T![crate] => 3, T!['('] | T![')'] => 2, kind if kind.is_trivia() => 0, _ => 1, @@ -3523,6 +3590,48 @@ use foo::bar::{self$0}; But this should appear "#]], + ) + } + + #[test] + fn hover_keyword() { + let ra_fixture = r#"//- /main.rs crate:main deps:std +fn f() { retur$0n; }"#; + let fixture = format!("{}\n{}", ra_fixture, FamousDefs::FIXTURE); + check( + &fixture, + expect![[r#" + *return* + + ```rust + return + ``` + + --- + + Docs for return_keyword + "#]], + ); + } + + #[test] + fn hover_builtin() { + let ra_fixture = r#"//- /main.rs crate:main deps:std +cosnt _: &str$0 = ""; }"#; + let fixture = format!("{}\n{}", ra_fixture, FamousDefs::FIXTURE); + check( + &fixture, + expect![[r#" + *str* + + ```rust + str + ``` + + --- + + Docs for prim_str + "#]], ); } } diff --git a/crates/ide_db/src/helpers.rs b/crates/ide_db/src/helpers.rs index f9de8ce0e..3ff77400b 100644 --- a/crates/ide_db/src/helpers.rs +++ b/crates/ide_db/src/helpers.rs @@ -41,6 +41,10 @@ pub struct FamousDefs<'a, 'b>(pub &'a Semantics<'b, RootDatabase>, pub Option { pub const FIXTURE: &'static str = include_str!("helpers/famous_defs_fixture.rs"); + pub fn std(&self) -> Option { + self.find_crate("std") + } + pub fn core(&self) -> Option { self.find_crate("core") } diff --git a/crates/ide_db/src/helpers/famous_defs_fixture.rs b/crates/ide_db/src/helpers/famous_defs_fixture.rs index bb4e9666b..d3464ae17 100644 --- a/crates/ide_db/src/helpers/famous_defs_fixture.rs +++ b/crates/ide_db/src/helpers/famous_defs_fixture.rs @@ -129,3 +129,11 @@ pub mod prelude { } #[prelude_import] pub use prelude::*; +//- /libstd.rs crate:std deps:core +//! Signatures of traits, types and functions from the std lib for use in tests. + +/// Docs for return_keyword +mod return_keyword {} + +/// Docs for prim_str +mod prim_str {} -- cgit v1.2.3