Fix SelectionRange return type

diff --git a/Cargo.lock b/Cargo.lock
index 2e052d267b56ca757e904eae11d3499698eb5762..0ae10b8fdf91d66cc358a26a29115910411824fc 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -655,9 +655,9 @@ dependencies = [
 
 [[package]]
 name = "lsp-types"
-version = "0.72.0"
+version = "0.73.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "face91691e558746745dc9dc6c67a4e2a24e044926e274d8378e6f19659329f0"
+checksum = "93d0cf64ea141b43d9e055f6b9df13f0bce32b103d84237509ce0a571ab9b159"
 dependencies = [
  "base64",
  "bitflags",

diff --git a/crates/ra_cargo_watch/Cargo.toml b/crates/ra_cargo_watch/Cargo.toml
index 731d50371a3032d77e23144dbc9e86aa0e4e5b85..d38d0e2b0adf1d88c0719a0b8ebb9c5cddf48e76 100644 (file)
--- a/crates/ra_cargo_watch/Cargo.toml
+++ b/crates/ra_cargo_watch/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["rust-analyzer developers"]
 
 [dependencies]
 crossbeam-channel = "0.4.0"
-lsp-types = { version = "0.72.0", features = ["proposed"] }
+lsp-types = { version = "0.73.0", features = ["proposed"] }
 log = "0.4.8"
 cargo_metadata = "0.9.1"
 serde_json = "1.0.48"

diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index b14ebb2686617ff8a6db3c9de6a0bc51ffee43f7..d44f0ef1d6894b2228c46e70157fc33006f9f553 100644 (file)
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -20,7 +20,7 @@ globset = "0.4.4"
 itertools = "0.8.2"
 jod-thread = "0.1.0"
 log = "0.4.8"
-lsp-types = { version = "0.72.0", features = ["proposed"] }
+lsp-types = { version = "0.73.0", features = ["proposed"] }
 parking_lot = "0.10.0"
 pico-args = "0.3.1"
 rand = { version = "0.7.3", features = ["small_rng"] }

diff --git a/crates/rust-analyzer/src/main_loop/handlers.rs b/crates/rust-analyzer/src/main_loop/handlers.rs
index b498c90c98748ac06e08eb80121b7c4f7168ffff..8dc6e8dc05d840fabeba66b5d7201574bc92e099 100644 (file)
--- a/crates/rust-analyzer/src/main_loop/handlers.rs
+++ b/crates/rust-analyzer/src/main_loop/handlers.rs
@@ -85,11 +85,11 @@ pub fn handle_expand_macro(
 pub fn handle_selection_range(
     world: WorldSnapshot,
     params: req::SelectionRangeParams,
-) -> Result<Vec<req::SelectionRange>> {
+) -> Result<Option<Vec<req::SelectionRange>>> {
     let _p = profile("handle_selection_range");
     let file_id = params.text_document.try_conv_with(&world)?;
     let line_index = world.analysis().file_line_index(file_id)?;
-    params
+    let res: Result<Vec<req::SelectionRange>> = params
         .positions
         .into_iter()
         .map_conv_with(&line_index)
@@ -120,7 +120,9 @@ pub fn handle_selection_range(
             }
             Ok(range)
         })
-        .collect()
+        .collect();
+
+    Ok(Some(res?))
 }
 
 pub fn handle_find_matching_brace(