mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-02 08:20:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Honor bold in syntax themes

Browse source
This commit is contained in:
Antonio Scandurra 2021-05-26 09:23:48 +02:00
parent ab64f2dd1d
commit e0cb5ccfba
2 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
zed/src/editor/buffer_view.rs
View file

@ -2140,9 +2140,12 @@ impl BufferView {
}
let settings = self.settings.borrow();
let font_id =
font_cache.select_font(settings.buffer_font_family, &FontProperties::new())?;
let font_size = settings.buffer_font_size;
let font_family = settings.buffer_font_family;
let mut prev_font_properties = FontProperties::new();
let mut prev_font_id = font_cache
.select_font(font_family, &prev_font_properties)
.unwrap();
let mut layouts = Vec::with_capacity(rows.len());
let mut line = String::new();
@ -2165,8 +2168,17 @@ impl BufferView {
}
if !line_chunk.is_empty() {
let (color, font_properties) = theme.syntax_style(style_ix);
// Avoid a lookup if the font properties match the previous ones.
let font_id = if font_properties == prev_font_properties {
prev_font_id
} else {
font_cache.select_font(font_family, &font_properties)?
};
line.push_str(line_chunk);
styles.push((line_chunk.len(), font_id, theme.syntax_style(style_ix).0));
styles.push((line_chunk.len(), font_id, color));
prev_font_id = font_id;
prev_font_properties = font_properties;
}
}
}

27
zed/src/settings.rs
View file

@ -3,7 +3,7 @@ use anyhow::{anyhow, Context, Result};
use gpui::{
color::ColorU,
font_cache::{FamilyId, FontCache},
fonts::Weight,
fonts::{Properties as FontProperties, Weight},
};
use postage::watch;
use serde::Deserialize;
@ -26,7 +26,7 @@ pub struct Theme {
pub background_color: ColorU,
pub line_number_color: ColorU,
pub default_text_color: ColorU,
syntax_styles: Vec<(String, ColorU, Weight)>,
syntax_styles: Vec<(String, ColorU, FontProperties)>,
}
#[derive(Clone, Debug)]
@ -74,17 +74,18 @@ impl Theme {
let theme_toml: ThemeToml =
toml::from_slice(source.as_ref()).context("failed to parse theme TOML")?;
let mut syntax_styles = Vec::<(String, ColorU, Weight)>::new();
let mut syntax_styles = Vec::<(String, ColorU, FontProperties)>::new();
for (key, style) in theme_toml.syntax {
let (color, weight) = match style {
StyleToml::Color(color) => (color, None),
StyleToml::Full { color, weight } => (color.unwrap_or(0), weight),
};
match syntax_styles.binary_search_by_key(&&key, |e| &e.0) {
Ok(i) | Err(i) => syntax_styles.insert(
i,
(key, deserialize_color(color), deserialize_weight(weight)?),
),
Ok(i) | Err(i) => {
let mut properties = FontProperties::new();
properties.weight = deserialize_weight(weight)?;
syntax_styles.insert(i, (key, deserialize_color(color), properties));
}
}
}
@ -112,10 +113,10 @@ impl Theme {
})
}
pub fn syntax_style(&self, id: StyleId) -> (ColorU, Weight) {
pub fn syntax_style(&self, id: StyleId) -> (ColorU, FontProperties) {
self.syntax_styles
.get(id.0 as usize)
.map_or((self.default_text_color, Weight::NORMAL), |entry| {
.map_or((self.default_text_color, FontProperties::new()), |entry| {
(entry.1, entry.2)
})
}
@ -232,17 +233,17 @@ mod tests {
(
"alpha.one".to_string(),
ColorU::from_u32(0x112233FF),
Weight::BOLD
*FontProperties::new().weight(Weight::BOLD)
),
(
"beta.two".to_string(),
ColorU::from_u32(0xAABBCCFF),
Weight::NORMAL
*FontProperties::new().weight(Weight::NORMAL)
),
(
"gamma.three".to_string(),
ColorU::from_u32(0x000000FF),
Weight::LIGHT,
*FontProperties::new().weight(Weight::LIGHT),
),
]
);
@ -268,7 +269,7 @@ mod tests {
("variable", ColorU::from_u32(0x600000ff)),
]
.iter()
.map(|e| (e.0.to_string(), e.1, Weight::NORMAL))
.map(|e| (e.0.to_string(), e.1, FontProperties::new()))
.collect(),
};