git.iko.soy/helix
on master help sign in
Optimize lsp_pos_to_pos (#1423)
ea095caKirawi
helix-lsp/src/lib.rs+5−18
compare with master
unifiedsplit
@@ -66,39 +66,26 @@ pub mod util {
66 pos: lsp::Position,
66 pos: lsp::Position,
67 offset_encoding: OffsetEncoding,
67 offset_encoding: OffsetEncoding,
68 ) -> Option<usize> {
68 ) -> Option<usize> {
69− let max_line = doc.lines().count().saturating_sub(1);
70 let pos_line = pos.line as usize;
69 let pos_line = pos.line as usize;
71− let pos_line = if pos_line > max_line {
70+ if pos_line > doc.len_lines() - 1 {
72 return None;
71 return None;
73− } else {
72+ }
74− pos_line
73+
75− };
76 match offset_encoding {
74 match offset_encoding {
77 OffsetEncoding::Utf8 => {
75 OffsetEncoding::Utf8 => {
78− let max_char = doc
79− .line_to_char(max_line)
80− .checked_add(doc.line(max_line).len_chars())?;
81 let line = doc.line_to_char(pos_line);
76 let line = doc.line_to_char(pos_line);
82 let pos = line.checked_add(pos.character as usize)?;
77 let pos = line.checked_add(pos.character as usize)?;
83− if pos <= max_char {
78+ if pos <= doc.len_chars() {
84 Some(pos)
79 Some(pos)
85 } else {
80 } else {
86 None
81 None
87 }
82 }
88 }
83 }
89 OffsetEncoding::Utf16 => {
84 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);
94 let line = doc.line_to_char(pos_line);
85 let line = doc.line_to_char(pos_line);
95 let line_start = doc.char_to_utf16_cu(line);
86 let line_start = doc.char_to_utf16_cu(line);
96 let pos = line_start.checked_add(pos.character as usize)?;
87 let pos = line_start.checked_add(pos.character as usize)?;
97− if pos <= max_cu {
88+ doc.try_utf16_cu_to_char(pos).ok()
98− Some(doc.utf16_cu_to_char(pos))
99− } else {
100− None
101− }
102 }
89 }
103 }
90 }
104 }
91 }