andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

Fix tab rendering to use dynamic tab width

Browse Source 
Each tab is just wide enough to round to the nearest tab stop.

Refs #1243
This commit is contained in:
Blaž Hrastnik 2022-03-04 11:01:33 +09:00
parent 5f386fa355
commit fd02d1bf89
No known key found for this signature in database
GPG Key ID: 1238B9C4AD889640
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helix-core/src/position.rs
View File

@ -83,7 +83,7 @@ pub fn visual_coords_at_pos(text: RopeSlice, pos: usize, tab_width: usize) -> Po
for grapheme in RopeGraphemes::new(text.slice(line_start..pos)) {
if grapheme == "\t" {
col += tab_width;
col += tab_width - (col % tab_width);
} else {
let grapheme = Cow::from(grapheme);
col += grapheme_width(&grapheme);

3
helix-term/src/ui/editor.rs
View File

@ -378,7 +378,8 @@ pub fn render_text_highlights<H: Iterator<Item = HighlightEvent>>(
let (grapheme, width) = if grapheme == "\t" {
// make sure we display tab as appropriate amount of spaces
(tab.as_str(), tab_width)
let visual_tab_width = tab_width - (visual_x as usize % tab_width);
(&tab[..visual_tab_width], visual_tab_width)
} else {
// Cow will prevent allocations if span contained in a single slice
// which should really be the majority case

23
helix-view/src/view.rs
View File

@ -243,18 +243,29 @@ pub fn text_pos_at_screen_coords(
let current_line = text.line(line_number);
let target = (column - inner.x) as usize + self.offset.col;
let mut selected = 0;
let mut col = 0;
// TODO: extract this part as pos_at_visual_coords
for grapheme in RopeGraphemes::new(current_line) {
if selected >= target {
if col >= target {
break;
}
if grapheme == "\t" {
selected += tab_width;
let width = if grapheme == "\t" {
tab_width - (col % tab_width)
} else {
let width = grapheme_width(&Cow::from(grapheme));
selected += width;
let grapheme = Cow::from(grapheme);
grapheme_width(&grapheme)
};
// If pos is in the middle of a wider grapheme (tab for example)
// return the starting offset.
if col + width >= target {
break;
}
col += width;
// TODO: use byte pos that converts back to char pos?
pos += grapheme.chars().count();
}