language-servers/tinymist
1
0
Fork 0
mirror of https://github.com/Myriad-Dreamin/tinymist.git synced 2025-08-03 17:58:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

fix: convert EOF position correctly (#92)

Browse source
This commit is contained in:
Myriad-Dreamin 2024-03-23 18:59:19 +08:00 • committed by GitHub
parent 9b09d6458e
commit b6dd6671c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
crates/tinymist-query/src/lsp_typst_boundary.rs
View file

@ -71,6 +71,17 @@ pub mod lsp_to_typst {
lsp_position_encoding: LspPositionEncoding,
typst_source: &Source,
) -> Option<TypstOffset> {
if lsp_position.line >= typst_source.len_lines() as u32 {
if lsp_position.line > typst_source.len_lines() as u32 || lsp_position.character > 0 {
log::warn!(
"LSP position is out of bounds: {:?}, while only {:?} lines and {:?} characters at the end.",
lsp_position, typst_source.len_lines(), typst_source.line_to_range(typst_source.len_lines() - 1),
);
}
return Some(typst_source.len_bytes());
}
match lsp_position_encoding {
LspPositionEncoding::Utf8 => {
let line_index = lsp_position.line as usize;
@ -300,6 +311,24 @@ mod test {
const ENCODING_TEST_STRING: &str = "test 🥺 test";
#[test]
fn issue_14_invalid_range() {
let source = Source::detached("#set page(height: 2cm)");
let rng = LspRange {
start: LspPosition {
line: 0,
character: 22,
},
// EOF
end: LspPosition {
line: 1,
character: 0,
},
};
let res = lsp_to_typst::range(rng, PositionEncoding::Utf16, &source).unwrap();
assert_eq!(res, 22..22);
}
#[test]
fn utf16_position_to_utf8_offset() {
let source = Source::detached(ENCODING_TEST_STRING);