Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 21:54:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix HoverAction::Implementation typo

Browse source
This commit is contained in:
Lukas Wirth 2021-01-04 14:24:37 +01:00
parent 0ae0909a16
commit 5804b3fae8
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
crates/ide/src/hover.rs
View file

@ -70,7 +70,7 @@ impl HoverConfig {
#[derive(Debug, Clone)]
pub enum HoverAction {
Runnable(Runnable),
Implementaion(FilePosition),
Implementation(FilePosition),
GoToType(Vec<HoverGotoTypeData>),
}
@ -116,12 +116,13 @@ 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.as_str())
remove_markdown(markup)
} else if links_in_hover {
rewrite_links(db, &markup.as_str(), &definition)
rewrite_links(db, markup, &definition)
} else {
remove_links(&markup.as_str())
remove_links(markup)
};
res.markup = Markup::from(markup);
if let Some(action) = show_implementations_action(db, definition) {
@ -175,7 +176,7 @@ pub(crate) fn hover(
fn show_implementations_action(db: &RootDatabase, def: Definition) -> Option<HoverAction> {
fn to_action(nav_target: NavigationTarget) -> HoverAction {
HoverAction::Implementaion(FilePosition {
HoverAction::Implementation(FilePosition {
file_id: nav_target.file_id,
offset: nav_target.focus_or_full_range().start(),
})
@ -1391,7 +1392,7 @@ fn bar() { fo<|>o(); }
r"unsafe trait foo<|>() {}",
expect![[r#"
[
Implementaion(
Implementation(
FilePosition {
file_id: FileId(
0,
@ -2103,7 +2104,7 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
r#"trait foo<|>() {}"#,
expect![[r#"
[
Implementaion(
Implementation(
FilePosition {
file_id: FileId(
0,
@ -2122,7 +2123,7 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
r"struct foo<|>() {}",
expect![[r#"
[
Implementaion(
Implementation(
FilePosition {
file_id: FileId(
0,
@ -2141,7 +2142,7 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
r#"union foo<|>() {}"#,
expect![[r#"
[
Implementaion(
Implementation(
FilePosition {
file_id: FileId(
0,
@ -2160,7 +2161,7 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
r"enum foo<|>() { A, B }",
expect![[r#"
[
Implementaion(
Implementation(
FilePosition {
file_id: FileId(
0,

2
crates/rust-analyzer/src/handlers.rs
View file

@ -1648,7 +1648,7 @@ fn prepare_hover_actions(
actions
.iter()
.filter_map(|it| match it {
HoverAction::Implementaion(position) => show_impl_command_link(snap, position),
HoverAction::Implementation(position) => show_impl_command_link(snap, position),
HoverAction::Runnable(r) => runnable_action_links(snap, file_id, r.clone()),
HoverAction::GoToType(targets) => goto_type_action_links(snap, targets),
})