Skip to content

Commit 9d837a6

Browse files
committed
Auto merge of #16445 - lnicola:bump-scip, r=lnicola
internal: Bump scip Fixes #16440
2 parents 2661c27 + 20c0167 commit 9d837a6

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/rust-analyzer/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ anyhow.workspace = true
2323
crossbeam-channel = "0.5.5"
2424
dissimilar.workspace = true
2525
itertools.workspace = true
26-
scip = "0.3.1"
26+
scip = "0.3.3"
2727
lsp-types = { version = "=0.95.0", features = ["proposed"] }
2828
parking_lot = "0.12.1"
2929
xflags = "0.3.0"

crates/rust-analyzer/src/cli/scip.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,14 @@ impl flags::Scip {
143143
.map(|hover| hover.markup.as_str())
144144
.filter(|it| !it.is_empty())
145145
.map(|it| vec![it.to_owned()]);
146+
let position_encoding =
147+
scip_types::PositionEncoding::UTF8CodeUnitOffsetFromLineStart.into();
146148
let signature_documentation =
147149
token.signature.clone().map(|text| scip_types::Document {
148150
relative_path: relative_path.clone(),
149151
language: "rust".to_string(),
150152
text,
153+
position_encoding,
151154
..Default::default()
152155
});
153156
let symbol_info = scip_types::SymbolInformation {
@@ -181,13 +184,16 @@ impl flags::Scip {
181184
continue;
182185
}
183186

187+
let position_encoding =
188+
scip_types::PositionEncoding::UTF8CodeUnitOffsetFromLineStart.into();
184189
documents.push(scip_types::Document {
185190
relative_path,
186191
language: "rust".to_string(),
187192
occurrences,
188193
symbols,
189-
special_fields: Default::default(),
190194
text: String::new(),
195+
position_encoding,
196+
special_fields: Default::default(),
191197
});
192198
}
193199

0 commit comments

Comments
 (0)