suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 183a561f1b into 205e7ece70

Takumi Matsuura 2025-06-14 14:20:19 -07:00 committed by GitHub
parent 205e7ece70 183a561f1b
commit 8d6003ebf2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
helix-term/src/commands.rs
View File

@ -6641,9 +6641,20 @@ fn jump_to_label(cx: &mut Context, labels: Vec<Range>, behaviour: Movement) {
if labels.is_empty() {
return;
}
let alphabet_char = |i| {
let alphabet_char = |i, use_fullwidth: bool| {
let mut res = Tendril::new();
res.push(alphabet[i]);
let ch = alphabet[i];
// Use full-width characters for wide characters to prevent rendering issues
let display_ch = if use_fullwidth {
match ch {
'a'..='z' => char::from_u32(ch as u32 - 'a' as u32 + 'ａ' as u32).unwrap_or(ch),
'A'..='Z' => char::from_u32(ch as u32 - 'A' as u32 + 'Ａ' as u32).unwrap_or(ch),
_ => ch,
}
} else {
ch
};
res.push(display_ch);
res
};
@ -6653,11 +6664,13 @@ fn jump_to_label(cx: &mut Context, labels: Vec<Range>, behaviour: Movement) {
.iter()
.enumerate()
.flat_map(|(i, range)| {
let pos = range.from();
let use_fullwidth = text.char(pos).width().unwrap_or(1) >= 2;
[
Overlay::new(range.from(), alphabet_char(i / alphabet.len())),
Overlay::new(pos, alphabet_char(i / alphabet.len(), use_fullwidth)),
Overlay::new(
graphemes::next_grapheme_boundary(text, range.from()),
alphabet_char(i % alphabet.len()),
graphemes::next_grapheme_boundary(text, pos),
alphabet_char(i % alphabet.len(), use_fullwidth),
),
]
})