Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get tab cursor working with correct character offset with utf16 chars

Browse source
This commit is contained in:
Anthony 2025-06-09 23:54:56 -04:00
parent 3f3125d206
commit 94b034ffc1
7 changed files with 255 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/language/src/buffer.rs
View file

@ -488,6 +488,8 @@ pub struct Chunk<'a> {
pub is_tab: bool,
/// A bitset of which characters are tabs in this string.
pub tabs: u128,
/// Bitmap of character indices in this chunk
pub chars: u128,
/// Whether this chunk of text was originally a tab character.
pub is_inlay: bool,
/// Whether to underline the corresponding text range in the editor.
@ -4582,7 +4584,7 @@ impl<'a> Iterator for BufferChunks<'a> {
}
self.diagnostic_endpoints = diagnostic_endpoints;
if let Some((chunk, tabs)) = self.chunks.peek_tabs() {
if let Some((chunk, tabs, chars_map)) = self.chunks.peek_tabs() {
let chunk_start = self.range.start;
let mut chunk_end = (self.chunks.offset() + chunk.len())
.min(next_capture_start)
@ -4598,6 +4600,7 @@ impl<'a> Iterator for BufferChunks<'a> {
let slice =
&chunk[chunk_start - self.chunks.offset()..chunk_end - self.chunks.offset()];
let tabs = tabs >> (chunk_start - self.chunks.offset());
let chars_map = chars_map >> (chunk_start - self.chunks.offset());
self.range.start = chunk_end;
if self.range.start == self.chunks.offset() + chunk.len() {
@ -4611,6 +4614,7 @@ impl<'a> Iterator for BufferChunks<'a> {
diagnostic_severity: self.current_diagnostic_severity(),
is_unnecessary: self.current_code_is_unnecessary(),
tabs,
chars: chars_map,
..Chunk::default()
})
} else {

9
crates/language/src/buffer_tests.rs
View file

@ -3281,11 +3281,12 @@ fn test_contiguous_ranges() {
#[test]
fn test_buffer_chunks_tabs() {
let buffer = text::Buffer::new(0, BufferId::new(1).unwrap(), "\ta\tbc");
let buffer = text::Buffer::new(0, BufferId::new(1).unwrap(), "\ta\tbc😁");
let mut iter = buffer.as_rope().chunks();
while let Some((str, tabs)) = iter.peek_tabs() {
dbg!(str, format!("{:b}", tabs));
while let Some((str, _, chars)) = iter.peek_tabs() {
dbg!(str.len(), str.bytes().count());
dbg!(str, format!("{:b}", chars));
iter.next();
}
dbg!("---");
@ -3294,7 +3295,7 @@ fn test_buffer_chunks_tabs() {
let mut iter = buffer.as_rope().chunks();
iter.seek(3);
while let Some((str, tabs)) = iter.peek_tabs() {
while let Some((str, tabs, _)) = iter.peek_tabs() {
dbg!(str, format!("{:b}", tabs));
iter.next();
}