Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | Cargo.lock | 26 | ||||
| -rw-r--r-- | crates/rust-analyzer/Cargo.toml | 4 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/lsp/capabilities.rs | 2 |
3 files changed, 5 insertions, 27 deletions
diff --git a/Cargo.lock b/Cargo.lock index 1599f458da..34067c6170 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1446,19 +1446,6 @@ dependencies = [ ] [[package]] -name = "lsp-types" -version = "0.95.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] name = "macros" version = "0.0.0" dependencies = [ @@ -2305,6 +2292,7 @@ dependencies = [ "dirs", "dissimilar", "expect-test", + "helix-lsp-types", "hir", "hir-def", "hir-ty", @@ -2316,7 +2304,6 @@ dependencies = [ "itertools 0.14.0", "load-cargo", "lsp-server", - "lsp-types", "memchr", "mimalloc", "num_cpus", @@ -2572,17 +2559,6 @@ dependencies = [ ] [[package]] -name = "serde_repr" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] name = "serde_spanned" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 94c0d32be1..ecf3bcdfed 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -29,7 +29,9 @@ ide-completion.workspace = true indexmap.workspace = true itertools.workspace = true scip = "0.5.2" -lsp-types = { version = "=0.95.0", features = ["proposed"] } +lsp-types = { git = "https://github.com/bend-n/helix", package = "helix-lsp-types", features = [ + "proposed", +] } parking_lot = "0.12.4" xflags = "0.3.2" oorandom = "11.1.5" diff --git a/crates/rust-analyzer/src/lsp/capabilities.rs b/crates/rust-analyzer/src/lsp/capabilities.rs index d6a694be91..4329d686f8 100644 --- a/crates/rust-analyzer/src/lsp/capabilities.rs +++ b/crates/rust-analyzer/src/lsp/capabilities.rs @@ -170,7 +170,7 @@ pub fn server_capabilities(config: &Config) -> ServerCapabilities { })), diagnostic_provider: Some(lsp_types::DiagnosticServerCapabilities::Options( lsp_types::DiagnosticOptions { - identifier: Some("rust-analyzer".to_owned()), + identifier: Some("rust-analyzer".into()), inter_file_dependencies: true, // FIXME workspace_diagnostics: false, |