Update lsp types (#1180)

* Bump lsp-types to 0.85

* Bump lsp-types to 0.86

* Fix ci dependency installation

* Fix tests

* Fix lint issues

Author: martskins

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
     - name: Install other dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install --yes --no-install-recommends neovim curl git python3-pip python3-pytest mypy flake8 npm make
+        sudo apt-get install --yes --no-install-recommends neovim curl git python3-pip python3-pytest mypy flake8 nodejs-dev node-gyp libssl1.0 npm make
         sudo apt-get clean
         sudo rm -rf /var/lib/apt/lists/*
         python3 -m pip install neovim vim-vint

Cargo.lock

@@ -28,7 +28,7 @@ serde_json = "1"
 json-patch = "0.2"
 crossbeam = "0.7.3"
 jsonrpc-core = "15"
-lsp-types = { version = "0.83", features = ["proposed"] }
+lsp-types = { version = "0.86", features = ["proposed"] }
 url = "2"
 pathdiff = "0"
 diff = "0"

Cargo.toml

@@ -21,25 +21,26 @@ use itertools::Itertools;
 use jsonrpc_core::Value;
 use log::{debug, error, info, warn};
 use lsp_types::{
-    notification::Notification, request::Request, ApplyWorkspaceEditParams,
-    ApplyWorkspaceEditResponse, ClientCapabilities, ClientInfo, CodeAction, CodeActionCapability,
-    CodeActionContext, CodeActionKind, CodeActionKindLiteralSupport, CodeActionLiteralSupport,
-    CodeActionOrCommand, CodeActionParams, CodeActionResponse, CodeLens, Command,
-    CompletionCapability, CompletionItem, CompletionItemCapability, CompletionResponse,
-    CompletionTextEdit, ConfigurationParams, Diagnostic, DiagnosticSeverity,
-    DidChangeConfigurationParams, DidChangeTextDocumentParams, DidChangeWatchedFilesParams,
+    notification::Notification, request::Request, AnnotatedTextEdit, ApplyWorkspaceEditParams,
+    ApplyWorkspaceEditResponse, ClientCapabilities, ClientInfo, CodeAction,
+    CodeActionClientCapabilities, CodeActionContext, CodeActionKind, CodeActionKindLiteralSupport,
+    CodeActionLiteralSupport, CodeActionOrCommand, CodeActionParams, CodeActionResponse, CodeLens,
+    CodeLensClientCapabilities, Command, CompletionClientCapabilities, CompletionItem,
+    CompletionItemCapability, CompletionResponse, CompletionTextEdit, ConfigurationParams,
+    Diagnostic, DiagnosticSeverity, DidChangeConfigurationParams, DidChangeTextDocumentParams,
+    DidChangeWatchedFilesClientCapabilities, DidChangeWatchedFilesParams,
     DidChangeWatchedFilesRegistrationOptions, DidCloseTextDocumentParams,
     DidOpenTextDocumentParams, DidSaveTextDocumentParams, DocumentChangeOperation, DocumentChanges,
-    DocumentFormattingParams, DocumentHighlight, DocumentHighlightKind,
-    DocumentRangeFormattingParams, DocumentSymbolParams, DocumentSymbolResponse, Documentation,
-    ExecuteCommandParams, FormattingOptions, GenericCapability, GotoCapability,
-    GotoDefinitionResponse, Hover, HoverCapability, InitializeParams, InitializeResult,
+    DocumentColorClientCapabilities, DocumentFormattingParams, DocumentHighlight,
+    DocumentHighlightKind, DocumentRangeFormattingParams, DocumentSymbolParams,
+    DocumentSymbolResponse, Documentation, ExecuteCommandParams, FormattingOptions, GotoCapability,
+    GotoDefinitionResponse, Hover, HoverClientCapabilities, InitializeParams, InitializeResult,
     InitializedParams, Location, LogMessageParams, MessageType, NumberOrString,
     ParameterInformation, ParameterInformationSettings, PartialResultParams, Position,
     ProgressParams, ProgressParamsValue, PublishDiagnosticsClientCapabilities,
     PublishDiagnosticsParams, Range, ReferenceContext, RegistrationParams, RenameParams,
     ResourceOp, SemanticHighlightingClientCapability, SemanticHighlightingParams,
-    ShowMessageParams, ShowMessageRequestParams, SignatureHelp, SignatureHelpCapability,
+    ShowMessageParams, ShowMessageRequestParams, SignatureHelp, SignatureHelpClientCapabilities,
     SignatureInformationSettings, SymbolInformation, TextDocumentClientCapabilities,
     TextDocumentContentChangeEvent, TextDocumentIdentifier, TextDocumentItem,
     TextDocumentPositionParams, TextEdit, UnregistrationParams, VersionedTextDocumentIdentifier,
@@ -226,7 +227,14 @@ impl LanguageClient {
             }
         } else if let Some(ref changes) = edit.changes {
             for (uri, edits) in changes {
-                position = self.apply_text_edits(&uri.filepath()?, edits, position)?;
+                position = self.apply_text_edits(
+                    &uri.filepath()?,
+                    &edits
+                        .iter()
+                        .map(|e| lsp_types::OneOf::Left(e.clone()))
+                        .collect::<Vec<lsp_types::OneOf<TextEdit, AnnotatedTextEdit>>>(),
+                    position,
+                )?;
             }
         }
         self.edit(&None, &filename)?;
@@ -298,7 +306,7 @@ impl LanguageClient {
     fn apply_text_edits<P: AsRef<Path> + std::fmt::Debug>(
         &self,
         path: P,
-        edits: &[TextEdit],
+        edits: &[lsp_types::OneOf<TextEdit, AnnotatedTextEdit>],
         position: Position,
     ) -> Result<Position> {
         if edits.is_empty() {
@@ -313,7 +321,13 @@ impl LanguageClient {
         // same order the server sent it, and so that a delete/replace (according to the LSP spec,
         // there can only be one per start position and it must be after the inserts) will work on
         // the original document, not on the just-inserted text.
-        edits.sort_by_key(|edit| (edit.range.start.line, edit.range.start.character));
+        edits.sort_by_key(|edit| match edit {
+            lsp_types::OneOf::Left(edit) => (edit.range.start.line, edit.range.start.character),
+            lsp_types::OneOf::Right(ae) => (
+                ae.text_edit.range.start.line,
+                ae.text_edit.range.start.character,
+            ),
+        });
         edits.reverse();
 
         self.edit(&None, path)?;
@@ -713,7 +727,7 @@ impl LanguageClient {
         Ok(())
     }
 
-    pub fn get_line(&self, path: impl AsRef<Path>, line: u64) -> Result<String> {
+    pub fn get_line(&self, path: impl AsRef<Path>, line: u32) -> Result<String> {
         let value: Value = self.vim()?.rpcclient.call(
             "getbufline",
             json!([path.as_ref().to_string_lossy(), line + 1]),
@@ -725,7 +739,7 @@ impl LanguageClient {
             let reader = BufReader::new(File::open(path)?);
             text = reader
                 .lines()
-                .nth(line.to_usize()?)
+                .nth(line as usize)
                 .ok_or_else(|| anyhow!("Failed to get line! line: {}", line))??;
         }
 
@@ -875,17 +889,17 @@ impl LanguageClient {
                     name: "LanguageClient-neovim".into(),
                     version: Some(self.version()),
                 }),
-                process_id: Some(u64::from(std::process::id())),
+                process_id: Some(std::process::id()),
                 /* deprecated in lsp types, but can't initialize without it */
                 root_path: Some(root.clone()),
                 root_uri: Some(root.to_url()?),
                 initialization_options: initialization_options.clone(),
                 capabilities: ClientCapabilities {
                     text_document: Some(TextDocumentClientCapabilities {
-                        color_provider: Some(GenericCapability {
+                        color_provider: Some(DocumentColorClientCapabilities {
                             dynamic_registration: Some(false),
                         }),
-                        completion: Some(CompletionCapability {
+                        completion: Some(CompletionClientCapabilities {
                             completion_item: Some(CompletionItemCapability {
                                 snippet_support: Some(has_snippet_support),
                                 documentation_format: preferred_markup_kind.clone(),
@@ -896,9 +910,9 @@ impl LanguageClient {
                                 insert_replace_support: Some(false),
                                 ..CompletionItemCapability::default()
                             }),
-                            ..CompletionCapability::default()
+                            ..CompletionClientCapabilities::default()
                         }),
-                        code_action: Some(CodeActionCapability {
+                        code_action: Some(CodeActionClientCapabilities {
                             code_action_literal_support: Some(CodeActionLiteralSupport {
                                 code_action_kind: CodeActionKindLiteralSupport {
                                     value_set: [
@@ -915,17 +929,17 @@ impl LanguageClient {
                                     .collect(),
                                 },
                             }),
-                            ..CodeActionCapability::default()
+                            ..CodeActionClientCapabilities::default()
                         }),
-                        signature_help: Some(SignatureHelpCapability {
+                        signature_help: Some(SignatureHelpClientCapabilities {
                             signature_information: Some(SignatureInformationSettings {
                                 active_parameter_support: None,
                                 documentation_format: preferred_markup_kind.clone(),
                                 parameter_information: Some(ParameterInformationSettings {
                                     label_offset_support: Some(true),
                                 }),
                             }),
-                            ..SignatureHelpCapability::default()
+                            ..SignatureHelpClientCapabilities::default()
                         }),
                         declaration: Some(GotoCapability {
                             link_support: Some(true),
@@ -947,24 +961,24 @@ impl LanguageClient {
                             related_information: Some(true),
                             ..PublishDiagnosticsClientCapabilities::default()
                         }),
-                        code_lens: Some(GenericCapability {
+                        code_lens: Some(CodeLensClientCapabilities {
                             dynamic_registration: Some(true),
                         }),
                         semantic_highlighting_capabilities: Some(
                             SemanticHighlightingClientCapability {
                                 semantic_highlighting: true,
                             },
                         ),
-                        hover: Some(HoverCapability {
+                        hover: Some(HoverClientCapabilities {
                             content_format: preferred_markup_kind,
-                            ..HoverCapability::default()
+                            ..HoverClientCapabilities::default()
                         }),
                         ..TextDocumentClientCapabilities::default()
                     }),
                     workspace: Some(WorkspaceClientCapabilities {
                         apply_edit: Some(true),
                         configuration: Some(true),
-                        did_change_watched_files: Some(GenericCapability {
+                        did_change_watched_files: Some(DidChangeWatchedFilesClientCapabilities {
                             dynamic_registration: Some(true),
                         }),
                         ..WorkspaceClientCapabilities::default()
@@ -973,6 +987,7 @@ impl LanguageClient {
                 },
                 trace: Some(trace),
                 workspace_folders: None,
+                locale: None,
             },
         )?;
 
@@ -1524,6 +1539,7 @@ impl LanguageClient {
         let text_edits = text_edits.unwrap_or_default();
         let edit = lsp_types::WorkspaceEdit {
             changes: Some(hashmap! {filename.to_url()? => text_edits}),
+            change_annotations: None,
             document_changes: None,
         };
         self.apply_workspace_edit(&edit)?;
@@ -1576,6 +1592,7 @@ impl LanguageClient {
         let text_edits = text_edits.unwrap_or_default();
         let edit = lsp_types::WorkspaceEdit {
             changes: Some(hashmap! {filename.to_url()? => text_edits}),
+            change_annotations: None,
             document_changes: None,
         };
         self.apply_workspace_edit(&edit)?;
@@ -1774,6 +1791,8 @@ impl LanguageClient {
         self.apply_workspace_edit(&params.edit)?;
         Ok(serde_json::to_value(ApplyWorkspaceEditResponse {
             applied: true,
+            failure_reason: None,
+            failed_change: None,
         })?)
     }
 
@@ -2052,7 +2071,7 @@ impl LanguageClient {
             DidChangeTextDocumentParams {
                 text_document: VersionedTextDocumentIdentifier {
                     uri: filename.to_url()?,
-                    version: Some(version),
+                    version,
                 },
                 content_changes: vec![TextDocumentContentChangeEvent {
                     range: None,
@@ -2291,7 +2310,7 @@ impl LanguageClient {
              * single line so simply clear between the first and last line to
              * ensure no highlights are left dangling
              */
-            let mut clear_region: Option<(u64, u64)> = None;
+            let mut clear_region: Option<(u32, u32)> = None;
             let mut highlights = Vec::with_capacity(semantic_hl_state.symbols.len());
 
             for line in &semantic_hl_state.symbols {
@@ -2303,9 +2322,9 @@ impl LanguageClient {
 
                         if let Some(Some(group)) = hl_table.get(token.scope as usize) {
                             highlights.push(Highlight {
-                                line: line.line as u64,
-                                character_start: token.character as u64,
-                                character_end: token.character as u64 + token.length as u64,
+                                line: line.line as u32,
+                                character_start: token.character,
+                                character_end: token.character + token.length as u32,
                                 group: group.clone(),
                                 text: String::new(),
                             });
@@ -2314,10 +2333,10 @@ impl LanguageClient {
 
                     match clear_region {
                         Some((begin, _)) => {
-                            clear_region = Some((begin, line.line as u64 + 1));
+                            clear_region = Some((begin, line.line as u32 + 1));
                         }
                         None => {
-                            clear_region = Some((line.line as u64, line.line as u64 + 1));
+                            clear_region = Some((line.line as u32, line.line as u32 + 1));
                         }
                     }
                 }
@@ -2720,7 +2739,7 @@ impl LanguageClient {
             CompletionResponse::List(list) => list.items,
         };
 
-        let complete_position: Option<u64> = try_get("complete_position", params)?;
+        let complete_position: Option<u32> = try_get("complete_position", params)?;
 
         let matches: Result<Vec<VimCompleteItem>> = matches
             .iter()
@@ -3161,7 +3180,7 @@ impl LanguageClient {
                 // Check that we're not doing anything stupid before going ahead with this.
                 let mut edit = edit;
                 edit.range.end.character =
-                    edit.range.start.character + completed_item.word.len() as u64;
+                    edit.range.start.character + completed_item.word.len() as u32;
                 if edit.range.end != position || edit.range.start.line != edit.range.end.line {
                     return Ok(());
                 }
@@ -3179,7 +3198,14 @@ impl LanguageClient {
             return Ok(());
         }
 
-        let position = self.apply_text_edits(filename, &edits, position)?;
+        let position = self.apply_text_edits(
+            filename,
+            &edits
+                .into_iter()
+                .map(lsp_types::OneOf::Left)
+                .collect::<Vec<lsp_types::OneOf<TextEdit, AnnotatedTextEdit>>>(),
+            position,
+        )?;
         self.vim()?
             .cursor(position.line + 1, position.character + 1)
     }
@@ -3218,12 +3244,12 @@ impl LanguageClient {
         let line = tokens_iter
             .next()
             .ok_or_else(|| anyhow!("Failed to get line! tokens: {:?}", tokens))?
-            .to_int()?
+            .parse::<u32>()?
             - 1;
         let character = tokens_iter
             .next()
             .ok_or_else(|| anyhow!("Failed to get character! tokens: {:?}", tokens))?
-            .to_int()?
+            .parse::<u32>()?
             - 1;
 
         self.edit(&None, &filename)?;

src/language_server_protocol.rs

@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 pub struct Sign {
     pub id: u64,
     /// line number. 0-based.
-    pub line: u64,
+    pub line: u32,
     pub name: String,
 }
 
@@ -14,7 +14,7 @@ impl From<&Diagnostic> for Sign {
         let line = diagnostic.range.start.line;
         let severity = diagnostic.severity.unwrap_or(DiagnosticSeverity::Hint);
         let name = format!("LanguageClient{:?}", severity);
-        let id = 75_000 + line * DiagnosticSeverity::Hint as u64 + severity as u64;
+        let id = 75_000 + line as u64 * DiagnosticSeverity::Hint as u64 + severity as u64;
 
         Sign { id, line, name }
     }