Unnamed repository; edit this file 'description' to name the repository.
Bump scip
Laurențiu Nicola 2024-01-30
parent 7219414 · commit 20c0167
-rw-r--r--Cargo.lock4
-rw-r--r--crates/rust-analyzer/Cargo.toml2
-rw-r--r--crates/rust-analyzer/src/cli/scip.rs8
3 files changed, 10 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 7513abf17c..f55e1c4536 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1661,9 +1661,9 @@ dependencies = [
[[package]]
name = "scip"
-version = "0.3.1"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e84d21062a3ba08d58870c8c36b0c005b2b2261c6ad1bf7042585427c781883"
+checksum = "e5dc1bd66649133af84ab62436ddd2856c2605182b02dec2cd197f684dfe15ef"
dependencies = [
"protobuf",
]
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index db5cabaf76..56d9d65ddc 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -23,7 +23,7 @@ anyhow.workspace = true
crossbeam-channel = "0.5.5"
dissimilar.workspace = true
itertools.workspace = true
-scip = "0.3.1"
+scip = "0.3.3"
lsp-types = { version = "=0.95.0", features = ["proposed"] }
parking_lot = "0.12.1"
xflags = "0.3.0"
diff --git a/crates/rust-analyzer/src/cli/scip.rs b/crates/rust-analyzer/src/cli/scip.rs
index c9cf40db3a..81622a4617 100644
--- a/crates/rust-analyzer/src/cli/scip.rs
+++ b/crates/rust-analyzer/src/cli/scip.rs
@@ -143,11 +143,14 @@ impl flags::Scip {
.map(|hover| hover.markup.as_str())
.filter(|it| !it.is_empty())
.map(|it| vec![it.to_owned()]);
+ let position_encoding =
+ scip_types::PositionEncoding::UTF8CodeUnitOffsetFromLineStart.into();
let signature_documentation =
token.signature.clone().map(|text| scip_types::Document {
relative_path: relative_path.clone(),
language: "rust".to_string(),
text,
+ position_encoding,
..Default::default()
});
let symbol_info = scip_types::SymbolInformation {
@@ -181,13 +184,16 @@ impl flags::Scip {
continue;
}
+ let position_encoding =
+ scip_types::PositionEncoding::UTF8CodeUnitOffsetFromLineStart.into();
documents.push(scip_types::Document {
relative_path,
language: "rust".to_string(),
occurrences,
symbols,
- special_fields: Default::default(),
text: String::new(),
+ position_encoding,
+ special_fields: Default::default(),
});
}