Skip to content

Make sure margin gets updated #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lhecker merged 4 commits into from
Jun 10, 2025
+42 −31
Merged

Make sure margin gets updated #436

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ff03d7
Reflow more.
Link1J Jun 6, 2025
b9fbce1
Merge remote-tracking branch 'origin/main' into Link1J-patch-1
lhecker Jun 10, 2025
7bc37b2
Don't reflow after changes
lhecker Jun 10, 2025
8624140
Address feedback
lhecker Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 42 additions & 31 deletions src/buffer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,39 +525,53 @@ impl TextBuffer {
}

pub fn reflow(&mut self) {
// +1 onto logical_lines, because line numbers are 1-based.
// +1 onto log10, because we want the digit width and not the actual log10.
// +3 onto log10, because we append " | " to the line numbers to form the margin.
self.margin_width = if self.margin_enabled {
self.stats.logical_lines.ilog10() as CoordType + 4
} else {
0
};
self.reflow_internal(true);
}

let text_width = self.text_width();
// 2 columns are required, because otherwise wide glyphs wouldn't ever fit.
self.word_wrap_column =
if self.word_wrap_enabled && text_width >= 2 { text_width } else { 0 };
fn recalc_after_content_changed(&mut self) {
self.reflow_internal(false);
}

// Recalculate the cursor position.
self.cursor = self.cursor_move_to_logical_internal(
if self.word_wrap_column > 0 {
Default::default()
fn reflow_internal(&mut self, force: bool) {
let word_wrap_column_before = self.word_wrap_column;

{
// +1 onto logical_lines, because line numbers are 1-based.
// +1 onto log10, because we want the digit width and not the actual log10.
// +3 onto log10, because we append " | " to the line numbers to form the margin.
self.margin_width = if self.margin_enabled {
self.stats.logical_lines.ilog10() as CoordType + 4
} else {
self.goto_line_start(self.cursor, self.cursor.logical_pos.y)
},
self.cursor.logical_pos,
);
0
};

// Recalculate the line statistics.
if self.word_wrap_column > 0 {
let end = self.cursor_move_to_logical_internal(self.cursor, Point::MAX);
self.stats.visual_lines = end.visual_pos.y + 1;
} else {
self.stats.visual_lines = self.stats.logical_lines;
let text_width = self.text_width();
// 2 columns are required, because otherwise wide glyphs wouldn't ever fit.
self.word_wrap_column =
if self.word_wrap_enabled && text_width >= 2 { text_width } else { 0 };
}

self.cursor_for_rendering = None;

if force || self.word_wrap_column != word_wrap_column_before {
// Recalculate the cursor position.
self.cursor = self.cursor_move_to_logical_internal(
if self.word_wrap_column > 0 {
Default::default()
} else {
self.goto_line_start(self.cursor, self.cursor.logical_pos.y)
},
self.cursor.logical_pos,
);

// Recalculate the line statistics.
if self.word_wrap_column > 0 {
let end = self.cursor_move_to_logical_internal(self.cursor, Point::MAX);
self.stats.visual_lines = end.visual_pos.y + 1;
} else {
self.stats.visual_lines = self.stats.logical_lines;
}
}
}

/// Replaces the entire buffer contents with the given `text`.
Expand All @@ -580,9 +594,7 @@ impl TextBuffer {
self.redo_stack.clear();
self.last_history_type = HistoryType::Other;
self.cursor = Default::default();
self.cursor_for_rendering = None;
self.set_selection(None);
self.search = None;
Comment on lines -583 to -585
Copy link
Member

@lhecker lhecker Jun 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two removed lines are old, from the initial import. I've since added dirty tracking in the ICU code which makes resetting self.search superfluous.

self.mark_as_clean();
self.reflow();
}
Expand Down Expand Up @@ -2311,8 +2323,7 @@ impl TextBuffer {
self.stats.visual_lines = self.stats.logical_lines;
}

self.search = None;
self.cursor_for_rendering = None;
self.recalc_after_content_changed();
}

/// Undo the last edit operation.
Expand Down Expand Up @@ -2426,7 +2437,7 @@ impl TextBuffer {
}
}

self.cursor_for_rendering = None;
self.recalc_after_content_changed();
}

/// For interfacing with ICU.
Expand Down