aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock4
-rw-r--r--crates/ra_cargo_watch/Cargo.toml2
-rw-r--r--crates/rust-analyzer/Cargo.toml2
-rw-r--r--crates/rust-analyzer/src/main_loop/handlers.rs8
4 files changed, 9 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 2e052d267..0ae10b8fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -655,9 +655,9 @@ dependencies = [
655 655
656[[package]] 656[[package]]
657name = "lsp-types" 657name = "lsp-types"
658version = "0.72.0" 658version = "0.73.0"
659source = "registry+https://github.com/rust-lang/crates.io-index" 659source = "registry+https://github.com/rust-lang/crates.io-index"
660checksum = "face91691e558746745dc9dc6c67a4e2a24e044926e274d8378e6f19659329f0" 660checksum = "93d0cf64ea141b43d9e055f6b9df13f0bce32b103d84237509ce0a571ab9b159"
661dependencies = [ 661dependencies = [
662 "base64", 662 "base64",
663 "bitflags", 663 "bitflags",
diff --git a/crates/ra_cargo_watch/Cargo.toml b/crates/ra_cargo_watch/Cargo.toml
index 731d50371..d38d0e2b0 100644
--- a/crates/ra_cargo_watch/Cargo.toml
+++ b/crates/ra_cargo_watch/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["rust-analyzer developers"]
6 6
7[dependencies] 7[dependencies]
8crossbeam-channel = "0.4.0" 8crossbeam-channel = "0.4.0"
9lsp-types = { version = "0.72.0", features = ["proposed"] } 9lsp-types = { version = "0.73.0", features = ["proposed"] }
10log = "0.4.8" 10log = "0.4.8"
11cargo_metadata = "0.9.1" 11cargo_metadata = "0.9.1"
12serde_json = "1.0.48" 12serde_json = "1.0.48"
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index b14ebb268..d44f0ef1d 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -20,7 +20,7 @@ globset = "0.4.4"
20itertools = "0.8.2" 20itertools = "0.8.2"
21jod-thread = "0.1.0" 21jod-thread = "0.1.0"
22log = "0.4.8" 22log = "0.4.8"
23lsp-types = { version = "0.72.0", features = ["proposed"] } 23lsp-types = { version = "0.73.0", features = ["proposed"] }
24parking_lot = "0.10.0" 24parking_lot = "0.10.0"
25pico-args = "0.3.1" 25pico-args = "0.3.1"
26rand = { version = "0.7.3", features = ["small_rng"] } 26rand = { 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 b498c90c9..8dc6e8dc0 100644
--- 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(
85pub fn handle_selection_range( 85pub fn handle_selection_range(
86 world: WorldSnapshot, 86 world: WorldSnapshot,
87 params: req::SelectionRangeParams, 87 params: req::SelectionRangeParams,
88) -> Result<Vec<req::SelectionRange>> { 88) -> Result<Option<Vec<req::SelectionRange>>> {
89 let _p = profile("handle_selection_range"); 89 let _p = profile("handle_selection_range");
90 let file_id = params.text_document.try_conv_with(&world)?; 90 let file_id = params.text_document.try_conv_with(&world)?;
91 let line_index = world.analysis().file_line_index(file_id)?; 91 let line_index = world.analysis().file_line_index(file_id)?;
92 params 92 let res: Result<Vec<req::SelectionRange>> = params
93 .positions 93 .positions
94 .into_iter() 94 .into_iter()
95 .map_conv_with(&line_index) 95 .map_conv_with(&line_index)
@@ -120,7 +120,9 @@ pub fn handle_selection_range(
120 } 120 }
121 Ok(range) 121 Ok(range)
122 }) 122 })
123 .collect() 123 .collect();
124
125 Ok(Some(res?))
124} 126}
125 127
126pub fn handle_find_matching_brace( 128pub fn handle_find_matching_brace(