mirror/ helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix synced 2024-05-17 14:56:05 +02:00
Code Issues

Speed up surface code by resetting instead of allocating a new one.

This commit is contained in:
Blaž Hrastnik 2020-09-17 16:17:41 +09:00
parent 088f8a82af
commit eb477ec442
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
helix-term/src/editor.rs
View File

@ -37,6 +37,7 @@ pub struct Editor {
first_line: u16,
size: (u16, u16),
surface: Surface,
cache: Surface,
theme: Theme,
}
@ -55,6 +56,7 @@ pub fn new(mut args: Args) -> Result<Self, Error> {
first_line: 0,
size,
surface: Surface::empty(area),
cache: Surface::empty(area),
theme,
// TODO; move to state
};
@ -82,8 +84,8 @@ fn render(&mut self) {
match &mut self.state {
Some(state) => {
let area = Rect::new(0, 0, self.size.0, self.size.1);
let mut surface = Surface::empty(area);
let mut stdout = stdout();
self.surface.reset(); // reset is faster than allocating new empty surface
// TODO: inefficient, should feed chunks.iter() to tree_sitter.parse_with(|offset, pos|)
let source_code = state.doc().to_string();
@ -146,7 +148,12 @@ fn render(&mut self) {
// which should really be the majority case
let grapheme = std::borrow::Cow::from(grapheme);
let width = grapheme_width(&grapheme) as u16;
surface.set_string(offset + visual_x, line, grapheme, style);
self.surface.set_string(
offset + visual_x,
line,
grapheme,
style,
);
visual_x += width;
}
@ -178,7 +185,7 @@ fn render(&mut self) {
// (x2 - x1 + 1) as u16,
// (y2 - y1 + 1) as u16,
// );
// surface.set_style(area, select);
// self.surface.set_style(area, select);
// // TODO: don't highlight next char in append mode
// }
@ -199,9 +206,9 @@ fn render(&mut self) {
self.terminal
.backend_mut()
.draw(self.surface.diff(&surface).into_iter());
.draw(self.cache.diff(&self.surface).into_iter());
// swap the buffer
self.surface = surface;
std::mem::swap(&mut self.surface, &mut self.cache);
// set cursor shape
match state.mode() {