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

Rebase on the latest master.

Browse Source
This commit is contained in:
vsrs
2020-06-03 15:13:26 +03:00
parent b147e6eb95
commit 5d0c1aa162
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1127,7 +1127,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
} }
#[test] #[test]
fn test_hover_trait_hash_impl_action() { fn test_hover_trait_has_impl_action() {
let (_, actions) = check_hover_result( let (_, actions) = check_hover_result(
" "
//- /lib.rs //- /lib.rs
@@ -1139,7 +1139,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
} }
#[test] #[test]
fn test_hover_struct_hash_impl_action() { fn test_hover_struct_has_impl_action() {
let (_, actions) = check_hover_result( let (_, actions) = check_hover_result(
" "
//- /lib.rs //- /lib.rs
@@ -1151,7 +1151,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
} }
#[test] #[test]
fn test_hover_union_hash_impl_action() { fn test_hover_union_has_impl_action() {
let (_, actions) = check_hover_result( let (_, actions) = check_hover_result(
" "
//- /lib.rs //- /lib.rs

20
crates/rust-analyzer/src/main_loop/handlers.rs
View File

@@ -553,7 +553,7 @@ pub fn handle_hover(
value: crate::markdown::format_docs(&info.info.to_markup()), value: crate::markdown::format_docs(&info.info.to_markup()),
}), }),
range: Some(range), range: Some(range),
actions: Some(prepare_hover_actions(&world, info.info.actions())), actions: Some(prepare_hover_actions(&snap, info.info.actions())),
}; };
Ok(Some(res)) Ok(Some(res))
} }
@@ -1176,18 +1176,18 @@ fn to_command_link(command: Command, tooltip: String) -> lsp_ext::CommandLink {
} }
fn show_impl_command_link( fn show_impl_command_link(
world: &WorldSnapshot, snap: &GlobalStateSnapshot,
position: &FilePosition, position: &FilePosition,
) -> Option<lsp_ext::CommandLinkGroup> { ) -> Option<lsp_ext::CommandLinkGroup> {
if world.config.hover.implementations { if snap.config.hover.implementations {
if let Some(nav_data) = world.analysis().goto_implementation(*position).unwrap_or(None) { if let Some(nav_data) = snap.analysis().goto_implementation(*position).unwrap_or(None) {
let uri = to_proto::url(world, position.file_id).ok()?; let uri = to_proto::url(snap, position.file_id).ok()?;
let line_index = world.analysis().file_line_index(position.file_id).ok()?; let line_index = snap.analysis().file_line_index(position.file_id).ok()?;
let position = to_proto::position(&line_index, position.offset); let position = to_proto::position(&line_index, position.offset);
let locations: Vec<_> = nav_data let locations: Vec<_> = nav_data
.info .info
.iter() .iter()
.filter_map(|it| to_proto::location(world, it.file_range()).ok()) .filter_map(|it| to_proto::location(snap, it.file_range()).ok())
.collect(); .collect();
let title = implementation_title(locations.len()); let title = implementation_title(locations.len());
let command = show_references_command(title, &uri, position, locations); let command = show_references_command(title, &uri, position, locations);
@@ -1202,17 +1202,17 @@ fn show_impl_command_link(
} }
fn prepare_hover_actions( fn prepare_hover_actions(
world: &WorldSnapshot, snap: &GlobalStateSnapshot,
actions: &[HoverAction], actions: &[HoverAction],
) -> Vec<lsp_ext::CommandLinkGroup> { ) -> Vec<lsp_ext::CommandLinkGroup> {
if world.config.hover.none() || !world.config.client_caps.hover_actions { if snap.config.hover.none() || !snap.config.client_caps.hover_actions {
return Vec::new(); return Vec::new();
} }
actions actions
.iter() .iter()
.filter_map(|it| match it { .filter_map(|it| match it {
HoverAction::Implementaion(position) => show_impl_command_link(world, position), HoverAction::Implementaion(position) => show_impl_command_link(snap, position),
}) })
.collect() .collect()
} }