leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Syntax highlight on demand

Browse source
This commit is contained in:
Jeremy Soller 2023-11-02 09:57:24 -06:00
parent ca35e1f429
commit 6196d72266
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
1 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/edit/syntect.rs
View file

@ -169,12 +169,30 @@ impl<'a> Edit for SyntaxEditor<'a> {
#[cfg(feature = "std")] #[cfg(feature = "std")]
let now = std::time::Instant::now(); let now = std::time::Instant::now();
let cursor = self.cursor();
let buffer = self.editor.buffer_mut(); let buffer = self.editor.buffer_mut();
let lines = buffer.visible_lines();
let scroll_end = buffer.scroll() + lines;
let mut total_layout = 0;
let mut highlighted = 0; let mut highlighted = 0;
for line_i in 0..buffer.lines.len() { for line_i in 0..buffer.lines.len() {
// Break out if we have reached the end of scroll and are past the cursor
if total_layout >= scroll_end && line_i > cursor.line {
break;
}
let line = &mut buffer.lines[line_i]; let line = &mut buffer.lines[line_i];
if !line.is_reset() && line_i < self.syntax_cache.len() { if !line.is_reset() && line_i < self.syntax_cache.len() {
//TODO: duplicated code!
// Perform shaping and layout of this line in order to count if we have reached scroll
match buffer.line_layout(font_system, line_i) {
Some(layout_lines) => {
total_layout += layout_lines.len() as i32;
},
None => {
//TODO: should this be possible?
}
}
continue; continue;
} }
highlighted += 1; highlighted += 1;
@ -229,8 +247,15 @@ impl<'a> Edit for SyntaxEditor<'a> {
line.set_attrs_list(attrs_list); line.set_attrs_list(attrs_list);
line.set_wrap(Wrap::Word); line.set_wrap(Wrap::Word);
//TODO: efficiently do syntax highlighting without having to shape whole buffer // Perform shaping and layout of this line in order to count if we have reached scroll
buffer.line_shape(font_system, line_i); match buffer.line_layout(font_system, line_i) {
Some(layout_lines) => {
total_layout += layout_lines.len() as i32;
},
None => {
//TODO: should this be possible?
}
}
let cache_item = (parse_state.clone(), highlight_state.clone()); let cache_item = (parse_state.clone(), highlight_state.clone());
if line_i < self.syntax_cache.len() { if line_i < self.syntax_cache.len() {