Skip to content

Simplifies /src/row.rs : 'update()' method implementation #616

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

Open
VRAM-RAM wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Simplifies /src/row.rs : 'update()' method implementation #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
027761f
Simplify 'update()' method implementation
VRAM-RAM Jun 2, 2026
0faead8
Simplify 'update()' method implementation
VRAM-RAM Jun 2, 2026
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
4 changes: 2 additions & 2 deletions fuzz/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions src/row.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,19 @@ impl Row {
/// Update the row: convert tabs into spaces and compute highlight symbols
/// The `hl_state` argument is the `HLState` for the previous row.
pub fn update(&mut self, syntax: &SyntaxConf, hl_state: HlState, tab: NonZeroUsize) -> HlState {
let (..) = (self.render.clear(), self.cx2rx.clear(), self.rx2cx.clear());
let (mut cx, mut rx) = (0, 0);
self.render.clear(); self.cx2rx.clear(); self.rx2cx.clear(); //Compact to keep the file under the line limit
let mut cx = 0; let mut rx = 0;

for c in String::from_utf8_lossy(&self.chars).chars() {
// The number of rendered characters
let n_rend_chars =
if c == '\t' { tab.get() - (rx % tab) } else { c.width().unwrap_or(1) };
self.render.push_str(&(if c == '\t' { " ".repeat(n_rend_chars) } else { c.into() }));
if c == '\t' { self.render.push_str(&" ".repeat(n_rend_chars)); } else { self.render.push(c); }
self.cx2rx.extend(repeat_n(rx, c.len_utf8()));
self.rx2cx.extend(repeat_n(cx, n_rend_chars));
(rx, cx) = (rx + n_rend_chars, cx + c.len_utf8());
rx += n_rend_chars; cx += c.len_utf8();
}
let (..) = (self.cx2rx.push(rx), self.rx2cx.push(cx));
self.cx2rx.push(rx); self.rx2cx.push(cx);
self.update_syntax(syntax, hl_state)
}

Expand Down
Loading