diff options
| author | bors <bors@rust-lang.org> | 2024-01-31 09:27:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-31 09:27:01 +0000 |
| commit | 9d837a622dbd1789c62526435e4703e5fcfddcf3 (patch) | |
| tree | 274ac99a46d469e8df57a48253548946b9725f6d | |
| parent | 2661c272c9cc68805a93faad618eb22ad0bd901b (diff) | |
| parent | 20c01672a8909408b53c704acc4bd71b1b0b279a (diff) | |
| download | rust-9d837a622dbd1789c62526435e4703e5fcfddcf3.tar.gz rust-9d837a622dbd1789c62526435e4703e5fcfddcf3.zip | |
Auto merge of #16445 - lnicola:bump-scip, r=lnicola
internal: Bump scip Fixes #16440
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | crates/rust-analyzer/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/cli/scip.rs | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock index dfaf5c23f18..1b5efb4bb81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1667,9 +1667,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 da421e7aaa4..a212041e66b 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 c9cf40db3a4..81622a4617a 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(), }); } |