Latest proposed LSP 3.16.0

Needs: https://github.com/gluon-lang/lsp-types/pull/183

diff --git a/Cargo.lock b/Cargo.lock
index 5c7bcb17b06b110a9cdce908e134d07753dc04cd..fe211b9b30fbd2e3df89bbe564eb8935cac7e4a5 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -852,9 +852,9 @@ dependencies = [
 
 [[package]]
 name = "lsp-types"
-version = "0.82.0"
+version = "0.83.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db895abb8527cf59e3de893ab2acf52cf904faeb65e60ea6f373e11fe86464e8"
+checksum = "25e0bd4b95038f2c23bda332ba0ca684e8dda765db1f9bdb63dc4c3e01f3b456"
 dependencies = [
  "base64",
  "bitflags",

diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 975b24aaf1b92d62286c97a9e0e07b7ac1ede4c1..d25c4bf83747202e06f0dc9a5ec237b7061712dc 100644 (file)
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -21,7 +21,7 @@ env_logger = { version = "0.8.1", default-features = false }
 itertools = "0.9.0"
 jod-thread = "0.1.0"
 log = "0.4.8"
-lsp-types = { version = "0.82.0", features = ["proposed"] }
+lsp-types = { version = "0.83.0", features = ["proposed"] }
 parking_lot = "0.11.0"
 pico-args = "0.3.1"
 oorandom = "11.1.2"

diff --git a/crates/rust-analyzer/src/caps.rs b/crates/rust-analyzer/src/caps.rs
index c589afeafcfc2ab19912a00ff3da3bfa89a47d29..ff1ae9575ffae6fcf95811420b78b7de23577d84 100644 (file)
--- a/crates/rust-analyzer/src/caps.rs
+++ b/crates/rust-analyzer/src/caps.rs
@@ -48,7 +48,7 @@ pub fn server_capabilities(client_caps: &ClientCapabilities) -> ServerCapabiliti
         references_provider: Some(OneOf::Left(true)),
         document_highlight_provider: Some(OneOf::Left(true)),
         document_symbol_provider: Some(OneOf::Left(true)),
-        workspace_symbol_provider: Some(true),
+        workspace_symbol_provider: Some(OneOf::Left(true)),
         code_action_provider: Some(code_action_provider),
         code_lens_provider: Some(CodeLensOptions { resolve_provider: Some(true) }),
         document_formatting_provider: Some(OneOf::Left(true)),
@@ -113,6 +113,7 @@ fn code_action_capabilities(client_caps: &ClientCapabilities) -> CodeActionProvi
                     CodeActionKind::REFACTOR_INLINE,
                     CodeActionKind::REFACTOR_REWRITE,
                 ]),
+                resolve_provider: None,
                 work_done_progress_options: Default::default(),
             })
         })

diff --git a/crates/rust-analyzer/src/diagnostics/to_proto.rs b/crates/rust-analyzer/src/diagnostics/to_proto.rs
index 33606edda4b0c03a75290ebe470cc9c27b32b7cd..b949577c13d63d99a69e9d36a34d12d9353f0b05 100644 (file)
--- a/crates/rust-analyzer/src/diagnostics/to_proto.rs
+++ b/crates/rust-analyzer/src/diagnostics/to_proto.rs
@@ -248,10 +248,12 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
                         range: in_macro_location.range,
                         severity,
                         code: code.clone().map(lsp_types::NumberOrString::String),
+                        code_description: None,
                         source: Some(source.clone()),
                         message: message.clone(),
                         related_information: Some(information_for_additional_diagnostic),
                         tags: if tags.is_empty() { None } else { Some(tags.clone()) },
+                        data: None,
                     };
 
                     Some(MappedRustDiagnostic {
@@ -267,6 +269,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
                 range: location.range,
                 severity,
                 code: code.clone().map(lsp_types::NumberOrString::String),
+                code_description: None,
                 source: Some(source.clone()),
                 message,
                 related_information: if related_information.is_empty() {
@@ -275,6 +278,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
                     Some(related_information.clone())
                 },
                 tags: if tags.is_empty() { None } else { Some(tags.clone()) },
+                data: None,
             };
 
             let main_diagnostic =

diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index 2680e5f08bce63d30067695b13ccff6f5c53449d..049c583a42cb6ec5a40e2a62572725074d8f96dd 100644 (file)
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -1121,10 +1121,12 @@ pub(crate) fn publish_diagnostics(
             range: to_proto::range(&line_index, d.range),
             severity: Some(to_proto::diagnostic_severity(d.severity)),
             code: None,
+            code_description: None,
             source: Some("rust-analyzer".to_string()),
             message: d.message,
             related_information: None,
             tags: if d.unused { Some(vec![DiagnosticTag::Unnecessary]) } else { None },
+            data: None,
         })
         .collect();
     Ok(diagnostics)

diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 24a658fc653d14d6f041b4d73fb9974be3748c9c..92b7c7b681073f4bd4c20df61022eb7c536c770b 100644 (file)
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -709,7 +709,16 @@ pub(crate) fn call_hierarchy_item(
     let detail = target.description.clone();
     let kind = symbol_kind(target.kind);
     let (uri, range, selection_range) = location_info(snap, target)?;
-    Ok(lsp_types::CallHierarchyItem { name, kind, tags: None, detail, uri, range, selection_range })
+    Ok(lsp_types::CallHierarchyItem {
+        name,
+        kind,
+        tags: None,
+        detail,
+        uri,
+        range,
+        selection_range,
+        data: None,
+    })
 }
 
 pub(crate) fn code_action_kind(kind: AssistKind) -> lsp_types::CodeActionKind {

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 33d60d4ddff6f624a81ae0de08a7c5e4feb738a4..86c3730add17dccbd4ba0fce2ec5ec1ceda86370 100644 (file)
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -2409,32 +2409,32 @@
             }
         },
         "vscode-jsonrpc": {
-            "version": "6.0.0-next.5",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.5.tgz",
-            "integrity": "sha512-IAgsltQPwg/pXOPsdXgbUTCaO9VSKZwirZN5SGtkdYQ/R3VjeC4v00WTVvoNayWMZpoC3O9u0ogqmsKzKhVasQ=="
+            "version": "6.0.0-next.6",
+            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.6.tgz",
+            "integrity": "sha512-w3w1T9tGsInSbGyv2kpi4o6ciMIyfVkM+kAvkxEv4zIv3fs69q3Qyt7ZMLiXnaRFXecIOY2ALDKwIMi0n2IwHQ=="
         },
         "vscode-languageclient": {
-            "version": "7.0.0-next.9",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.9.tgz",
-            "integrity": "sha512-lFO+rN/i72CM2va6iKXq1lD7pJg8J93KEXf0w0boWVqU+DJhWzLrV3pXl8Xk1nCv//qOAyhlc/nx2KZCTeRF/A==",
+            "version": "7.0.0-next.10",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.10.tgz",
+            "integrity": "sha512-J9Hp64j1aaQfXlhMPGI1XAcdsIcSNPAL6022JElzgxsfAydmQfZeKCCNdyybjhmZ+xrep2yoVRAeD5TZFP7y6g==",
             "requires": {
                 "semver": "^6.3.0",
-                "vscode-languageserver-protocol": "3.16.0-next.7"
+                "vscode-languageserver-protocol": "3.16.0-next.8"
             }
         },
         "vscode-languageserver-protocol": {
-            "version": "3.16.0-next.7",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.7.tgz",
-            "integrity": "sha512-tOjrg+K3RddJ547zpC9/LAgTbzadkPuHlqJFFWIcKjVhiJOh73XyY+Ngcu9wukGaTsuSGjJ0W8rlmwanixa0FQ==",
+            "version": "3.16.0-next.8",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.8.tgz",
+            "integrity": "sha512-AWMc7vVN7xuTpQf6A7yvaYjxyKEeMBQWJpkcRgT3EFAYU8PXJK2NCL0wPrgHH2soF/bErxJwajA1vNtCqrsRsg==",
             "requires": {
-                "vscode-jsonrpc": "6.0.0-next.5",
-                "vscode-languageserver-types": "3.16.0-next.3"
+                "vscode-jsonrpc": "6.0.0-next.6",
+                "vscode-languageserver-types": "3.16.0-next.4"
             }
         },
         "vscode-languageserver-types": {
-            "version": "3.16.0-next.3",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.3.tgz",
-            "integrity": "sha512-s/z5ZqSe7VpoXJ6JQcvwRiPPA3nG0nAcJ/HH03zoU6QaFfnkcgPK+HshC3WKPPnC2G08xA0iRB6h7kmyBB5Adg=="
+            "version": "3.16.0-next.4",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.4.tgz",
+            "integrity": "sha512-NlKJyGcET/ZBCCLBYIPaGo2c37R03bPYeWXozUtnjyye7+9dhlbMSODyoG2INcQf8zFmB4qhm2UOJjgYEgPCNA=="
         },
         "vscode-test": {
             "version": "1.4.0",

diff --git a/editors/code/package.json b/editors/code/package.json
index af845d7bc429aa61e83fea26299f7a441a50cf76..26044491c3f09fa51355039b42cfe1e989c0e0b3 100644 (file)
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -36,7 +36,7 @@
     },
     "dependencies": {
         "node-fetch": "^2.6.1",
-        "vscode-languageclient": "7.0.0-next.9"
+        "vscode-languageclient": "7.0.0-next.10"
     },
     "devDependencies": {
         "@rollup/plugin-commonjs": "^13.0.2",

diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts
index 08159b43c3e1ebb62a4ca87b59b666b5c826d74a..53492a445c4eea8268f6f5ad71c33220e60de076 100644 (file)
--- a/editors/code/src/util.ts
+++ b/editors/code/src/util.ts
@@ -75,12 +75,11 @@ export async function sendRequestWithRetry<TParam, TRet>(
                 log.warn("LSP request timed out", { method: reqType.method, param, error });
                 throw error;
             }
-
-            if (error.code === lc.ErrorCodes.RequestCancelled) {
+            if (error.code === lc.LSPErrorCodes.RequestCancelled) {
                 throw error;
             }
 
-            if (error.code !== lc.ErrorCodes.ContentModified) {
+            if (error.code !== lc.LSPErrorCodes.ContentModified) {
                 log.warn("LSP request failed", { method: reqType.method, param, error });
                 throw error;
             }