Switch to PR version of lsp-server

nushell · Nov 14, 2023 · d66daa4 · d66daa4
1 parent 5f14539
commit d66daa4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
@@ -16,7 +16,7 @@ reedline = { version = "0.26" }
 
 crossbeam-channel = "0.5.8"
 lsp-types = "0.94.1"
-lsp-server = "0.7.4"
+lsp-server = { version = "0.7.4", git = "https://github.com/schrieveslaach/rust-analyzer.git", branch = "cancelable-initialization" }
 miette = "5.10"
 ropey = "1.6.1"
 serde = "1.0"

diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
@@ -74,11 +74,9 @@ impl LanguageServer {
         })
         .expect("Must be serializable");
 
-        // TODO: raise a PR to add ctrlc support otherwise it is impossible to use ctrl-c to quit
-        // the process in the initialization stage
         let _initialization_params = self
             .connection
-            .initialize(server_capabilities)
+            .initialize_while(server_capabilities, || !ctrlc.load(Ordering::SeqCst))
             .into_diagnostic()?;
 
         while !ctrlc.load(Ordering::SeqCst) {