From 3ab328b49a5a4fc47d81ea390b1d42f67ca3c018 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Thu, 3 Jan 2019 14:14:36 +0100 Subject: use lsp WorkspaceEdit instead of custom source_file_edits and file_system_edits --- crates/ra_lsp_server/src/req.rs | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'crates/ra_lsp_server/src/req.rs') diff --git a/crates/ra_lsp_server/src/req.rs b/crates/ra_lsp_server/src/req.rs index 747ab8a8c..b41e90328 100644 --- a/crates/ra_lsp_server/src/req.rs +++ b/crates/ra_lsp_server/src/req.rs @@ -1,6 +1,6 @@ -use serde::{Serialize, Deserialize}; use languageserver_types::{Location, Position, Range, TextDocumentIdentifier, Url}; use rustc_hash::FxHashMap; +use serde::{Deserialize, Serialize}; use url_serde; pub use languageserver_types::{ @@ -8,7 +8,7 @@ pub use languageserver_types::{ CompletionResponse, DocumentOnTypeFormattingParams, DocumentSymbolParams, DocumentSymbolResponse, ExecuteCommandParams, Hover, InitializeResult, PublishDiagnosticsParams, ReferenceParams, SignatureHelp, TextDocumentEdit, - TextDocumentPositionParams, TextEdit, WorkspaceSymbolParams, + TextDocumentPositionParams, TextEdit, WorkspaceEdit, WorkspaceSymbolParams, }; pub enum SyntaxTree {} @@ -151,26 +151,10 @@ pub struct Runnable { #[serde(rename_all = "camelCase")] pub struct SourceChange { pub label: String, - pub source_file_edits: Vec, - pub file_system_edits: Vec, + pub workspace_edit: WorkspaceEdit, pub cursor_position: Option, } -#[derive(Serialize, Debug)] -#[serde(tag = "type", rename_all = "camelCase")] -pub enum FileSystemEdit { - CreateFile { - #[serde(with = "url_serde")] - uri: Url, - }, - MoveFile { - #[serde(with = "url_serde")] - src: Url, - #[serde(with = "url_serde")] - dst: Url, - }, -} - pub enum InternalFeedback {} impl Notification for InternalFeedback { -- cgit v1.2.3