@@ -645,7 +645,11 @@ impl Client {
645645 // Calculation is therefore a bunch trickier.
646646
647647 use helix_core::RopeSlice;
648− fn traverse(pos: lsp::Position, text: RopeSlice) -> lsp::Position {
648+ fn traverse(
649+ pos: lsp::Position,
650+ text: RopeSlice,
651+ offset_encoding: OffsetEncoding,
652+ ) -> lsp::Position {
649653 let lsp::Position {
650654 mut line,
651655 mut character,
@@ -662,7 +666,11 @@ impl Client {
662666 line += 1;
663667 character = 0;
664668 } else {
665− character += ch.len_utf16() as u32;
669+ character += match offset_encoding {
670+ OffsetEncoding::Utf8 => ch.len_utf8() as u32,
671+ OffsetEncoding::Utf16 => ch.len_utf16() as u32,
672+ OffsetEncoding::Utf32 => 1,
673+ };
666674 }
667675 }
668676 lsp::Position { line, character }
@@ -683,7 +691,7 @@ impl Client {
683691 }
684692 Delete(_) => {
685693 let start = pos_to_lsp_pos(new_text, new_pos, offset_encoding);
686− let end = traverse(start, old_text.slice(old_pos..old_end));
694+ let end = traverse(start, old_text.slice(old_pos..old_end), offset_encoding);
687695
688696 // deletion
689697 changes.push(lsp::TextDocumentContentChangeEvent {
@@ -700,7 +708,8 @@ impl Client {
700708 // a subsequent delete means a replace, consume it
701709 let end = if let Some(Delete(len)) = iter.peek() {
702710 old_end = old_pos + len;
703− let end = traverse(start, old_text.slice(old_pos..old_end));
711+ let end =
712+ traverse(start, old_text.slice(old_pos..old_end), offset_encoding);
704713
705714 iter.next();
706715