berkus
/
kdl-rs
mirror of https://github.com/kdl-org/kdl-rs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): prevent char index out of bounds panic in diagnostic positions 

Convert byte indices to char indices before calculating positions in the
rope. The previous implementation passed byte offsets directly to char
indexing functions, causing a panic when the byte index exceeded the
character count.
This commit is contained in:
Thomas KEMKEMIAN 2026-02-27 01:12:29 +01:00
parent 268f3a2d00
commit 997cdc45f6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/kdl-lsp/src/main.rs
View File

@ -111,8 +111,8 @@ impl LanguageServer for Backend {
.map(|diag| {
Diagnostic::new(
Range::new(
char_to_position(diag.span.offset(), &doc),
char_to_position(diag.span.offset() + diag.span.len(), &doc),
byte_to_position(diag.span.offset(), &doc),
byte_to_position(diag.span.offset() + diag.span.len(), &doc),
),
diag.severity().map(to_lsp_sev),
diag.code().map(|c| NumberOrString::String(c.to_string())),
@ -159,7 +159,8 @@ impl LanguageServer for Backend {
// }
}
fn char_to_position(char_idx: usize, rope: &Rope) -> Position {
fn byte_to_position(byte_idx: usize, rope: &Rope) -> Position {
let char_idx = rope.byte_to_char(byte_idx);
let line_idx = rope.char_to_line(char_idx);
let line_char_idx = rope.line_to_char(line_idx);
let column_idx = char_idx - line_char_idx;