mirror of
https://github.com/FuelLabs/sway.git
synced 2025-08-24 12:24:32 +00:00
fd2b56d320
## Description
This PR refactors most of the code that was in `server.rs`.
Specifically, the call backs have been moved to
`handlers/notification.rs` and `handlers/request.rs`. This was inspired
by `rust-analyzer`s approach.
the `server.rs` module now looks like:
```rust
#[tower_lsp::async_trait]
impl LanguageServer for ServerState {
async fn initialize(&self, params: InitializeParams) -> Result<InitializeResult> {
request::handle_initialize(self, params)
}
async fn shutdown(&self) -> Result<()> {
self.shutdown_server()
}
async fn did_open(&self, params: DidOpenTextDocumentParams) {
notification::handle_did_open_text_document(self, params).await;
}
async fn did_change(&self, params: DidChangeTextDocumentParams) {
notification::handle_did_change_text_document(self, params).await;
}
async fn did_save(&self, params: DidSaveTextDocumentParams) {
notification::handle_did_save_text_document(self, params).await;
}
async fn did_change_watched_files(&self, params: DidChangeWatchedFilesParams) {
notification::handle_did_change_watched_files(self, params).await;
}
async fn hover(&self, params: HoverParams) -> Result<Option<Hover>> {
request::handle_hover(self, params)
}
async fn code_action(&self, params: CodeActionParams) -> Result<Option<CodeActionResponse>> {
request::handle_code_action(self, params)
}
async fn code_lens(&self, params: CodeLensParams) -> Result<Option<Vec<CodeLens>>> {
request::handle_code_lens(self, params)
}
etc ...
}
```
A new type called `ServerState` now holds the config, keyword docs,
client and the map of sessions. No new functionality has been added
apart from refactoring the code.
This is needed for the new event loop, I decided to separate that into a
follow up PR to make things a bit more manageable.
closes #4672
509 lines
15 KiB
Rust
509 lines
15 KiB
Rust
//! This file contains methods used for simulating LSP code action json-rpc notifications and requests.
|
|
//! The methods are used to build and send requests and notifications to the LSP service
|
|
//! and assert the expected responses.
|
|
|
|
use crate::integration::lsp::{build_request_with_id, call_request};
|
|
use assert_json_diff::assert_json_eq;
|
|
use serde_json::json;
|
|
use sway_lsp::server_state::ServerState;
|
|
use tower_lsp::{
|
|
jsonrpc::{Request, Response},
|
|
lsp_types::*,
|
|
LspService,
|
|
};
|
|
|
|
pub(crate) async fn code_action_abi_request(
|
|
service: &mut LspService<ServerState>,
|
|
uri: &Url,
|
|
) -> Request {
|
|
let params = json!({
|
|
"textDocument": {
|
|
"uri": uri,
|
|
},
|
|
"range" : {
|
|
"start":{
|
|
"line": 27,
|
|
"character": 4
|
|
},
|
|
"end":{
|
|
"line": 27,
|
|
"character": 9
|
|
},
|
|
},
|
|
"context": {
|
|
"diagnostics": [],
|
|
"triggerKind": 2
|
|
}
|
|
});
|
|
let code_action = build_request_with_id("textDocument/codeAction", params, 1);
|
|
let response = call_request(service, code_action.clone()).await;
|
|
let uri_string = uri.to_string();
|
|
let expected = Response::from_ok(
|
|
1.into(),
|
|
json!([{
|
|
"data": uri,
|
|
"edit": {
|
|
"changes": {
|
|
uri_string: [
|
|
{
|
|
"newText": "\nimpl FooABI for Contract {\n fn main() -> u64 {}\n}\n",
|
|
"range": {
|
|
"end": {
|
|
"character": 0,
|
|
"line": 31
|
|
},
|
|
"start": {
|
|
"character": 0,
|
|
"line": 31
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"kind": "refactor",
|
|
"title": "Generate impl for `FooABI`"
|
|
}]),
|
|
);
|
|
assert_json_eq!(expected, response.ok().unwrap());
|
|
code_action
|
|
}
|
|
|
|
pub(crate) async fn code_action_function_request(
|
|
service: &mut LspService<ServerState>,
|
|
uri: &Url,
|
|
) -> Request {
|
|
let params = json!({
|
|
"textDocument": {
|
|
"uri": uri,
|
|
},
|
|
"range" : {
|
|
"start": {
|
|
"line": 18,
|
|
"character": 4
|
|
},
|
|
"end": {
|
|
"line": 18,
|
|
"character": 4
|
|
}
|
|
},
|
|
"context": {
|
|
"diagnostics": [],
|
|
"triggerKind": 2
|
|
}
|
|
});
|
|
let code_action = build_request_with_id("textDocument/codeAction", params, 1);
|
|
let response = call_request(service, code_action.clone()).await;
|
|
let uri_string = uri.to_string();
|
|
let expected = Response::from_ok(
|
|
1.into(),
|
|
json!([
|
|
{
|
|
"data": uri,
|
|
"edit": {
|
|
"changes": {
|
|
uri_string: [
|
|
{
|
|
"newText": "/// Add a brief description.\n/// \n/// ### Additional Information\n/// \n/// Provide information beyond the core purpose or functionality.\n/// \n/// ### Reverts\n/// \n/// * List any cases where the function will revert\n/// \n/// ### Number of Storage Accesses\n/// \n/// * Reads: `0`\n/// * Writes: `0`\n/// * Clears: `0`\n/// \n/// ### Examples\n/// \n/// ```sway\n/// let x = test();\n/// ```\n",
|
|
"range": {
|
|
"end": {
|
|
"character": 0,
|
|
"line": 18
|
|
},
|
|
"start": {
|
|
"character": 0,
|
|
"line": 18
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"kind": "refactor",
|
|
"title": "Generate a documentation template"
|
|
}
|
|
]),
|
|
);
|
|
assert_json_eq!(expected, response.ok().unwrap());
|
|
code_action
|
|
}
|
|
|
|
pub(crate) async fn code_action_trait_fn_request(
|
|
service: &mut LspService<ServerState>,
|
|
uri: &Url,
|
|
) -> Request {
|
|
let params = json!({
|
|
"textDocument": {
|
|
"uri": uri,
|
|
},
|
|
"range" : {
|
|
"start": {
|
|
"line": 10,
|
|
"character": 10
|
|
},
|
|
"end": {
|
|
"line": 10,
|
|
"character": 10
|
|
}
|
|
},
|
|
"context": {
|
|
"diagnostics": [],
|
|
"triggerKind": 2
|
|
}
|
|
});
|
|
let code_action = build_request_with_id("textDocument/codeAction", params, 1);
|
|
let response = call_request(service, code_action.clone()).await;
|
|
let uri_string = uri.to_string();
|
|
let expected = Response::from_ok(
|
|
1.into(),
|
|
json!([
|
|
{
|
|
"data": uri,
|
|
"edit": {
|
|
"changes": {
|
|
uri_string: [
|
|
{
|
|
"newText": " /// Add a brief description.\n /// \n /// ### Additional Information\n /// \n /// Provide information beyond the core purpose or functionality.\n /// \n /// ### Returns\n /// \n /// * [Empty] - Add description here\n /// \n /// ### Reverts\n /// \n /// * List any cases where the function will revert\n /// \n /// ### Number of Storage Accesses\n /// \n /// * Reads: `0`\n /// * Writes: `0`\n /// * Clears: `0`\n /// \n /// ### Examples\n /// \n /// ```sway\n /// let x = test_function();\n /// ```\n",
|
|
"range": {
|
|
"end": {
|
|
"character": 0,
|
|
"line": 10
|
|
},
|
|
"start": {
|
|
"character": 0,
|
|
"line": 10
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"kind": "refactor",
|
|
"title": "Generate a documentation template"
|
|
}
|
|
]),
|
|
);
|
|
assert_json_eq!(expected, response.ok().unwrap());
|
|
code_action
|
|
}
|
|
|
|
pub(crate) async fn code_action_struct_request(
|
|
service: &mut LspService<ServerState>,
|
|
uri: &Url,
|
|
) -> Request {
|
|
let params = json!({
|
|
"textDocument": {
|
|
"uri": uri,
|
|
},
|
|
"range" : {
|
|
"start": {
|
|
"line": 19,
|
|
"character": 11
|
|
},
|
|
"end": {
|
|
"line": 19,
|
|
"character": 11
|
|
}
|
|
},
|
|
"context": {
|
|
"diagnostics": [],
|
|
"triggerKind": 2
|
|
}
|
|
});
|
|
let code_action = build_request_with_id("textDocument/codeAction", params, 1);
|
|
let response = call_request(service, code_action.clone()).await;
|
|
let uri_string = uri.to_string();
|
|
let expected = Response::from_ok(
|
|
1.into(),
|
|
json!([
|
|
{
|
|
"data": uri,
|
|
"edit": {
|
|
"changes": {
|
|
uri_string.clone(): [
|
|
{
|
|
"newText": "\nimpl Data {\n \n}\n",
|
|
"range": {
|
|
"end": {
|
|
"character": 0,
|
|
"line": 25
|
|
},
|
|
"start": {
|
|
"character": 0,
|
|
"line": 25
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"kind": "refactor",
|
|
"title": "Generate impl for `Data`"
|
|
},
|
|
{
|
|
"data": uri,
|
|
"edit": {
|
|
"changes": {
|
|
uri_string.clone(): [
|
|
{
|
|
"newText": "\nimpl Data {\n fn new(value: NumberOrString, address: u64) -> Self { Self { value, address } }\n}\n",
|
|
"range": {
|
|
"end": {
|
|
"character": 0,
|
|
"line": 25
|
|
},
|
|
"start": {
|
|
"character": 0,
|
|
"line": 25
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"kind": "refactor",
|
|
"title": "Generate `new`"
|
|
},
|
|
{
|
|
"data": uri,
|
|
"edit": {
|
|
"changes": {
|
|
uri_string: [
|
|
{
|
|
"newText": "/// Add a brief description.\n/// \n/// ### Additional Information\n/// \n/// Provide information beyond the core purpose or functionality.\n", "range": {
|
|
"end": {
|
|
"character": 0,
|
|
"line": 19
|
|
},
|
|
"start": {
|
|
"character": 0,
|
|
"line": 19
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"kind": "refactor",
|
|
"title": "Generate a documentation template"
|
|
}
|
|
]),
|
|
);
|
|
assert_json_eq!(expected, response.ok().unwrap());
|
|
code_action
|
|
}
|
|
|
|
pub(crate) async fn code_action_struct_type_params_request(
|
|
service: &mut LspService<ServerState>,
|
|
uri: &Url,
|
|
) -> Request {
|
|
let params = json!({
|
|
"textDocument": {
|
|
"uri": uri
|
|
},
|
|
"range": {
|
|
"start": {
|
|
"line": 4,
|
|
"character": 9
|
|
},
|
|
"end": {
|
|
"line": 4,
|
|
"character": 9
|
|
}
|
|
},
|
|
"context": {
|
|
"diagnostics": [],
|
|
"triggerKind": 2
|
|
}
|
|
});
|
|
let code_action = build_request_with_id("textDocument/codeAction", params, 1);
|
|
let response = call_request(service, code_action.clone()).await;
|
|
let uri_string = uri.to_string();
|
|
let expected = Response::from_ok(
|
|
1.into(),
|
|
json!([
|
|
{
|
|
"data": uri,
|
|
"edit": {
|
|
"changes": {
|
|
uri_string.clone(): [
|
|
{
|
|
"newText": "\nimpl<T> Data<T> {\n \n}\n",
|
|
"range": {
|
|
"end": {
|
|
"character": 0,
|
|
"line": 7
|
|
},
|
|
"start": {
|
|
"character": 0,
|
|
"line": 7
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"kind": "refactor",
|
|
"title": "Generate impl for `Data`"
|
|
},
|
|
{
|
|
"data": uri,
|
|
"disabled": {
|
|
"reason": "Struct Data already has a `new` function"
|
|
},
|
|
"edit": {
|
|
"changes": {
|
|
uri_string.clone(): [
|
|
{
|
|
"newText": " fn new(value: T) -> Self { Self { value } }\n",
|
|
"range": {
|
|
"end": {
|
|
"character": 0,
|
|
"line": 9
|
|
},
|
|
"start": {
|
|
"character": 0,
|
|
"line": 9
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"kind": "refactor",
|
|
"title": "Generate `new`"
|
|
},
|
|
{
|
|
"data": uri,
|
|
"edit": {
|
|
"changes": {
|
|
uri_string: [
|
|
{
|
|
"newText": "/// Add a brief description.\n/// \n/// ### Additional Information\n/// \n/// Provide information beyond the core purpose or functionality.\n", "range": {
|
|
"end": {
|
|
"character": 0,
|
|
"line": 4
|
|
},
|
|
"start": {
|
|
"character": 0,
|
|
"line": 4
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"kind": "refactor",
|
|
"title": "Generate a documentation template"
|
|
}
|
|
]),
|
|
);
|
|
assert_json_eq!(expected, response.ok().unwrap());
|
|
code_action
|
|
}
|
|
|
|
pub(crate) async fn code_action_struct_existing_impl_request(
|
|
service: &mut LspService<ServerState>,
|
|
uri: &Url,
|
|
) -> Request {
|
|
let params = json!({
|
|
"textDocument": {
|
|
"uri": uri
|
|
},
|
|
"range": {
|
|
"start": {
|
|
"line": 2,
|
|
"character": 7
|
|
},
|
|
"end": {
|
|
"line": 2,
|
|
"character": 7
|
|
}
|
|
},
|
|
"context": {
|
|
"diagnostics": [],
|
|
"triggerKind": 2
|
|
}
|
|
});
|
|
let code_action = build_request_with_id("textDocument/codeAction", params, 1);
|
|
let response = call_request(service, code_action.clone()).await;
|
|
let uri_string = uri.to_string();
|
|
let expected = Response::from_ok(
|
|
1.into(),
|
|
json!([
|
|
{
|
|
"data": uri,
|
|
"edit": {
|
|
"changes": {
|
|
uri_string.clone(): [
|
|
{
|
|
"newText": "\nimpl A {\n \n}\n",
|
|
"range": {
|
|
"end": {
|
|
"character": 0,
|
|
"line": 6
|
|
},
|
|
"start": {
|
|
"character": 0,
|
|
"line": 6
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"kind": "refactor",
|
|
"title": "Generate impl for `A`"
|
|
},
|
|
{
|
|
"data": uri,
|
|
"edit": {
|
|
"changes": {
|
|
uri_string.clone(): [
|
|
{
|
|
"newText": " fn new(a: u64, b: u64) -> Self { Self { a, b } }\n",
|
|
"range": {
|
|
"end": {
|
|
"character": 0,
|
|
"line": 8
|
|
},
|
|
"start": {
|
|
"character": 0,
|
|
"line": 8
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"kind": "refactor",
|
|
"title": "Generate `new`"
|
|
},
|
|
{
|
|
"data": uri,
|
|
"edit": {
|
|
"changes": {
|
|
uri_string: [
|
|
{
|
|
"newText": "/// Add a brief description.\n/// \n/// ### Additional Information\n/// \n/// Provide information beyond the core purpose or functionality.\n", "range": {
|
|
"end": {
|
|
"character": 0,
|
|
"line": 2
|
|
},
|
|
"start": {
|
|
"character": 0,
|
|
"line": 2
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"kind": "refactor",
|
|
"title": "Generate a documentation template"
|
|
}
|
|
]),
|
|
);
|
|
assert_json_eq!(expected, response.ok().unwrap());
|
|
code_action
|
|
}
|