andrey/helix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: Optimize tree-sitter style lookups

Browse Source 
Tree sitter returns an index referring to the position of the scope in
the scopes array. We can use that same index to avoid a hashmap lookup
and instead store the styles in an array.

This currently stores the styles in both a map and an array because the
UI still uses hashmap lookups, but it's a reasonable tradeoff.
This commit is contained in:
Blaž Hrastnik 2021-12-01 13:08:20 +09:00
parent 7bbf4c5b06
commit 259678585c
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,8 +311,7 @@ pub fn render_text_highlights<H: Iterator<Item = HighlightEvent>>(
if LineEnding::from_rope_slice(&grapheme).is_some() { if LineEnding::from_rope_slice(&grapheme).is_some() {
if !out_of_bounds { if !out_of_bounds {
let style = spans.iter().fold(text_style, |acc, span| { let style = spans.iter().fold(text_style, |acc, span| {
let style = theme.get(theme.scopes()[span.0].as_str()); acc.patch(theme.highlight(span.0))
acc.patch(style)
}); });
// we still want to render an empty cell with the style // we still want to render an empty cell with the style
@ -346,8 +345,7 @@ pub fn render_text_highlights<H: Iterator<Item = HighlightEvent>>(
if !out_of_bounds { if !out_of_bounds {
let style = spans.iter().fold(text_style, |acc, span| { let style = spans.iter().fold(text_style, |acc, span| {
let style = theme.get(theme.scopes()[span.0].as_str()); acc.patch(theme.highlight(span.0))
acc.patch(style)
}); });
// if we're offscreen just keep going until we hit a new line // if we're offscreen just keep going until we hit a new line

27
helix-view/src/theme.rs
View File

@ -78,8 +78,11 @@ pub fn default(&self) -> Theme {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct Theme { pub struct Theme {
scopes: Vec<String>, // UI styles are stored in a HashMap
styles: HashMap<String, Style>, styles: HashMap<String, Style>,
// tree-sitter highlight styles are stored in a Vec to optimize lookups
scopes: Vec<String>,
highlights: Vec<Style>,
} }
impl<'de> Deserialize<'de> for Theme { impl<'de> Deserialize<'de> for Theme {
@ -88,6 +91,8 @@ fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
let mut styles = HashMap::new(); let mut styles = HashMap::new();
let mut scopes = Vec::new();
let mut highlights = Vec::new();
if let Ok(mut colors) = HashMap::<String, Value>::deserialize(deserializer) { if let Ok(mut colors) = HashMap::<String, Value>::deserialize(deserializer) {
// TODO: alert user of parsing failures in editor // TODO: alert user of parsing failures in editor
@ -102,21 +107,35 @@ fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
.unwrap_or_default(); .unwrap_or_default();
styles.reserve(colors.len()); styles.reserve(colors.len());
scopes.reserve(colors.len());
highlights.reserve(colors.len());
for (name, style_value) in colors { for (name, style_value) in colors {
let mut style = Style::default(); let mut style = Style::default();
if let Err(err) = palette.parse_style(&mut style, style_value) { if let Err(err) = palette.parse_style(&mut style, style_value) {
warn!("{}", err); warn!("{}", err);
} }
styles.insert(name, style);
// these are used both as UI and as highlights
styles.insert(name.clone(), style);
scopes.push(name);
highlights.push(style);
} }
} }
let scopes = styles.keys().map(ToString::to_string).collect(); Ok(Self {
Ok(Self { scopes, styles }) scopes,
styles,
highlights,
})
} }
} }
impl Theme { impl Theme {
pub fn highlight(&self, index: usize) -> Style {
self.highlights[index]
}
pub fn get(&self, scope: &str) -> Style { pub fn get(&self, scope: &str) -> Style {
self.try_get(scope) self.try_get(scope)
.unwrap_or_else(|| Style::default().fg(Color::Rgb(0, 0, 255))) .unwrap_or_else(|| Style::default().fg(Color::Rgb(0, 0, 255)))