Merge #1484

1484: Update to lsp-types 0.58.0 r=matklad a=kjeremy

Fixes CodeActionResponse

Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>

Author: bors[bot]

Cargo.lock

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 description = "Generic LSP server scaffold."
 
 [dependencies]
-lsp-types = "0.57.0"
+lsp-types = "0.58.0"
 log = "0.4.3"
 serde_json = "1.0.34"
 serde = { version = "1.0.83", features = ["derive"] }

crates/gen_lsp_server/Cargo.toml

@@ -13,7 +13,7 @@ crossbeam-channel = "0.3.5"
 flexi_logger = "0.13.0"
 log = "0.4.3"
 url_serde = "0.2.0"
-lsp-types = { version = "0.57.1", features = ["proposed"] }
+lsp-types = { version = "0.58.0", features = ["proposed"] }
 rustc-hash = "1.0"
 parking_lot = "0.8.0"
 

crates/ra_lsp_server/Cargo.toml

@@ -2,11 +2,11 @@ use std::{fmt::Write as _, io::Write as _};
 
 use gen_lsp_server::ErrorCode;
 use lsp_types::{
-    CodeAction, CodeActionResponse, CodeLens, Command, Diagnostic, DiagnosticSeverity,
-    DocumentFormattingParams, DocumentHighlight, DocumentSymbol, FoldingRange, FoldingRangeKind,
-    FoldingRangeParams, Hover, HoverContents, Location, MarkupContent, MarkupKind, Position,
-    PrepareRenameResponse, Range, RenameParams, SymbolInformation, TextDocumentIdentifier,
-    TextEdit, WorkspaceEdit,
+    CodeAction, CodeActionOrCommand, CodeActionResponse, CodeLens, Command, Diagnostic,
+    DiagnosticSeverity, DocumentFormattingParams, DocumentHighlight, DocumentSymbol, FoldingRange,
+    FoldingRangeKind, FoldingRangeParams, Hover, HoverContents, Location, MarkupContent,
+    MarkupKind, Position, PrepareRenameResponse, Range, RenameParams, SymbolInformation,
+    TextDocumentIdentifier, TextEdit, WorkspaceEdit,
 };
 use ra_ide_api::{
     AssistId, Cancelable, FileId, FilePosition, FileRange, FoldKind, Query, RangeInfo,
@@ -665,7 +665,7 @@ pub fn handle_code_action(
 
     let assists = world.analysis().assists(FileRange { file_id, range })?.into_iter();
     let diagnostics = world.analysis().diagnostics(file_id)?;
-    let mut res: Vec<CodeAction> = Vec::new();
+    let mut res = CodeActionResponse::default();
 
     let fixes_from_diagnostics = diagnostics
         .into_iter()
@@ -689,7 +689,7 @@ pub fn handle_code_action(
             edit: None,
             command: Some(command),
         };
-        res.push(action);
+        res.push(CodeActionOrCommand::CodeAction(action));
     }
 
     for assist in assists {
@@ -711,10 +711,10 @@ pub fn handle_code_action(
             edit: None,
             command: Some(command),
         };
-        res.push(action);
+        res.push(CodeActionOrCommand::CodeAction(action));
     }
 
-    Ok(Some(CodeActionResponse::Actions(res)))
+    Ok(Some(res))
 }
 
 pub fn handle_code_lens(