Merge rust-lang#7661

7661: Start LSP 3.17 support r=kjeremy a=kjeremy Companion to gluon-lang/lsp-types#199 which <strike>has not been merged yet</strike> has been merged. This doesn't opt into any 3.17 functionality yet. Co-authored-by: Jeremy Kolb <[email protected]>
yonipeleg33 · Feb 14, 2021 · 7435b9e · 7435b9e
2 parents a0fa585 + 8105418
commit 7435b9e
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
@@ -22,7 +22,7 @@ env_logger = { version = "0.8.1", default-features = false }
 itertools = "0.10.0"
 jod-thread = "0.1.0"
 log = "0.4.8"
-lsp-types = { version = "0.86.0", features = ["proposed"] }
+lsp-types = { version = "0.87.0", features = ["proposed"] }
 parking_lot = "0.11.0"
 pico-args = "0.4.0"
 oorandom = "11.1.2"

diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
@@ -127,6 +127,7 @@ fn run_server() -> Result<()> {
             name: String::from("rust-analyzer"),
             version: Some(String::from(env!("REV"))),
         }),
+        offset_encoding: None,
     };
 
     let initialize_result = serde_json::to_value(initialize_result).unwrap();

diff --git a/crates/rust-analyzer/src/caps.rs b/crates/rust-analyzer/src/caps.rs
@@ -34,6 +34,8 @@ pub fn server_capabilities(client_caps: &ClientCapabilities) -> ServerCapabiliti
         completion_provider: Some(CompletionOptions {
             resolve_provider: completions_resolve_provider(client_caps),
             trigger_characters: Some(vec![":".to_string(), ".".to_string()]),
+            all_commit_characters: None,
+            completion_item: None,
             work_done_progress_options: WorkDoneProgressOptions { work_done_progress: None },
         }),
         signature_help_provider: Some(SignatureHelpOptions {
@@ -58,7 +60,6 @@ pub fn server_capabilities(client_caps: &ClientCapabilities) -> ServerCapabiliti
             more_trigger_character: Some(vec![".".to_string(), ">".to_string()]),
         }),
         selection_range_provider: Some(SelectionRangeProviderCapability::Simple(true)),
-        semantic_highlighting: None,
         folding_range_provider: Some(FoldingRangeProviderCapability::Simple(true)),
         rename_provider: Some(OneOf::Right(RenameOptions {
             prepare_provider: Some(true),

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
diff --git a/editors/code/package.json b/editors/code/package.json
@@ -21,7 +21,7 @@
         "Programming Languages"
     ],
     "engines": {
-        "vscode": "^1.52.0"
+        "vscode": "^1.53.0"
     },
     "enableProposedApi": true,
     "scripts": {
@@ -36,7 +36,7 @@
     },
     "dependencies": {
         "node-fetch": "^2.6.1",
-        "vscode-languageclient": "7.0.0"
+        "vscode-languageclient": "^7.1.0-next.1"
     },
     "devDependencies": {
         "@rollup/plugin-commonjs": "^17.0.0",
@@ -45,7 +45,7 @@
         "@types/mocha": "^8.0.4",
         "@types/node": "~12.12.6",
         "@types/node-fetch": "^2.5.7",
-        "@types/vscode": "^1.52.0",
+        "@types/vscode": "^1.53.0",
         "@typescript-eslint/eslint-plugin": "^4.9.0",
         "@typescript-eslint/parser": "^4.9.0",
         "eslint": "^7.15.0",

diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
@@ -79,7 +79,7 @@ export function createClient(serverPath: string, cwd: string, extraEnv: Env): lc
                         return hover;
                     },
                     (error) => {
-                        client.handleFailedRequest(lc.HoverRequest.type, error, null);
+                        client.handleFailedRequest(lc.HoverRequest.type, token, error, null);
                         return Promise.resolve(null);
                     });
             },