Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-17 02:08:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add capabilities tests.

Browse source
This commit is contained in:
vsrs 2020-06-03 17:35:26 +03:00
parent e35418ceb9
commit 0fe43a124b
3 changed files with 184 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/rust-analyzer/src/lsp_ext.rs
View file

@ -273,8 +273,8 @@ impl Request for HoverRequest {
pub struct Hover {
#[serde(flatten)]
pub hover: lsp_types::Hover,
#[serde(skip_serializing_if = "Option::is_none")]
pub actions: Option<Vec<CommandLinkGroup>>,
#[serde(skip_serializing_if = "Vec::is_empty")]
pub actions: Vec<CommandLinkGroup>,
}
#[derive(Debug, PartialEq, Clone, Default, Deserialize, Serialize)]

7
crates/rust-analyzer/src/main_loop/handlers.rs
View file

@ -555,7 +555,7 @@ pub fn handle_hover(
}),
range: Some(range),
},
actions: Some(prepare_hover_actions(&snap, info.info.actions())),
actions: prepare_hover_actions(&snap, info.info.actions()),
};
Ok(Some(hover))
@ -1170,10 +1170,7 @@ fn show_references_command(
}
fn to_command_link(command: Command, tooltip: String) -> lsp_ext::CommandLink {
lsp_ext::CommandLink {
tooltip: Some(tooltip),
command,
}
lsp_ext::CommandLink { tooltip: Some(tooltip), command }
}
fn show_impl_command_link(

180
crates/rust-analyzer/tests/heavy_tests/main.rs
View file

@ -715,3 +715,183 @@ pub fn foo(_input: TokenStream) -> TokenStream {
let value = res.get("contents").unwrap().get("value").unwrap().to_string();
assert_eq!(value, r#""```rust\nfoo::Bar\n```\n\n```rust\nfn bar()\n```""#)
}
#[test]
fn test_client_support_hover_actions() {
if skip_slow_tests() {
return;
}
let server = Project::with_fixture(
r#"
//- Cargo.toml
[package]
name = "foo"
version = "0.0.0"
//- src/lib.rs
struct Foo(u32);
struct NoImpl(u32);
impl Foo {
fn new() -> Self {
Self(1)
}
}
"#,
)
.with_config(|config| {
config.client_caps.hover_actions = true;
})
.server();
server.wait_until_workspace_is_loaded();
// has 1 implementation
server.request::<HoverRequest>(
HoverParams {
text_document_position_params: TextDocumentPositionParams::new(
server.doc_id("src/lib.rs"),
Position::new(0, 9),
),
work_done_progress_params: Default::default(),
},
json!({
"actions": [{
"commands": [{
"arguments": [
"file:///[..]src/lib.rs",
{
"character": 7,
"line": 0
},
[{
"range": { "end": { "character": 1, "line": 8 }, "start": { "character": 0, "line": 4 } },
"uri": "file:///[..]src/lib.rs"
}]
],
"command": "rust-analyzer.showReferences",
"title": "1 implementation",
"tooltip": "Go to implementations"
}]
}],
"contents": { "kind": "markdown", "value": "```rust\nfoo\n```\n\n```rust\nstruct Foo\n```" },
"range": { "end": { "character": 10, "line": 0 }, "start": { "character": 7, "line": 0 } }
})
);
// no hover
server.request::<HoverRequest>(
HoverParams {
text_document_position_params: TextDocumentPositionParams::new(
server.doc_id("src/lib.rs"),
Position::new(1, 0),
),
work_done_progress_params: Default::default(),
},
json!(null),
);
// no implementations
server.request::<HoverRequest>(
HoverParams {
text_document_position_params: TextDocumentPositionParams::new(
server.doc_id("src/lib.rs"),
Position::new(2, 12),
),
work_done_progress_params: Default::default(),
},
json!({
"actions": [{
"commands": [{
"arguments": [
"file:///[..]src/lib.rs",
{ "character": 7, "line": 2 },
[]
],
"command": "rust-analyzer.showReferences",
"title": "0 implementations",
"tooltip": "Go to implementations"
}]
}],
"contents": { "kind": "markdown", "value": "```rust\nfoo\n```\n\n```rust\nstruct NoImpl\n```" },
"range": { "end": { "character": 13, "line": 2 }, "start": { "character": 7, "line": 2 } }
})
);
}
#[test]
fn test_client_does_not_support_hover_actions() {
if skip_slow_tests() {
return;
}
let server = Project::with_fixture(
r#"
//- Cargo.toml
[package]
name = "foo"
version = "0.0.0"
//- src/lib.rs
struct Foo(u32);
struct NoImpl(u32);
impl Foo {
fn new() -> Self {
Self(1)
}
}
"#,
)
.with_config(|config| {
config.client_caps.hover_actions = false;
})
.server();
server.wait_until_workspace_is_loaded();
// has 1 implementation
server.request::<HoverRequest>(
HoverParams {
text_document_position_params: TextDocumentPositionParams::new(
server.doc_id("src/lib.rs"),
Position::new(0, 9),
),
work_done_progress_params: Default::default(),
},
json!({
"contents": { "kind": "markdown", "value": "```rust\nfoo\n```\n\n```rust\nstruct Foo\n```" },
"range": { "end": { "character": 10, "line": 0 }, "start": { "character": 7, "line": 0 } }
})
);
// no hover
server.request::<HoverRequest>(
HoverParams {
text_document_position_params: TextDocumentPositionParams::new(
server.doc_id("src/lib.rs"),
Position::new(1, 0),
),
work_done_progress_params: Default::default(),
},
json!(null),
);
// no implementations
server.request::<HoverRequest>(
HoverParams {
text_document_position_params: TextDocumentPositionParams::new(
server.doc_id("src/lib.rs"),
Position::new(2, 12),
),
work_done_progress_params: Default::default(),
},
json!({
"contents": { "kind": "markdown", "value": "```rust\nfoo\n```\n\n```rust\nstruct NoImpl\n```" },
"range": { "end": { "character": 13, "line": 2 }, "start": { "character": 7, "line": 2 } }
})
);
}