@@ -66,39 +66,26 @@ pub mod util {
6666 pos: lsp::Position,
6767 offset_encoding: OffsetEncoding,
6868 ) -> Option<usize> {
69− let max_line = doc.lines().count().saturating_sub(1);
7069 let pos_line = pos.line as usize;
71− let pos_line = if pos_line > max_line {
70+ if pos_line > doc.len_lines() - 1 {
7271 return None;
73− } else {
74− pos_line
75− };
72+ }
73+
7674 match offset_encoding {
7775 OffsetEncoding::Utf8 => {
78− let max_char = doc
79− .line_to_char(max_line)
80− .checked_add(doc.line(max_line).len_chars())?;
8176 let line = doc.line_to_char(pos_line);
8277 let pos = line.checked_add(pos.character as usize)?;
83− if pos <= max_char {
78+ if pos <= doc.len_chars() {
8479 Some(pos)
8580 } else {
8681 None
8782 }
8883 }
8984 OffsetEncoding::Utf16 => {
90− let max_char = doc
91− .line_to_char(max_line)
92− .checked_add(doc.line(max_line).len_chars())?;
93− let max_cu = doc.char_to_utf16_cu(max_char);
9485 let line = doc.line_to_char(pos_line);
9586 let line_start = doc.char_to_utf16_cu(line);
9687 let pos = line_start.checked_add(pos.character as usize)?;
97− if pos <= max_cu {
98− Some(doc.utf16_cu_to_char(pos))
99− } else {
100− None
101− }
88+ doc.try_utf16_cu_to_char(pos).ok()
10289 }
10390 }
10491 }