Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deal with special case where a VSCode theme doesn't have a foreground color

Browse source 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
This commit is contained in:
Nate Butler 2023-11-09 14:53:04 -05:00
parent 54157eb99a
commit 1c6a960bbf
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/theme2/src/themes/solarized.rs
View file

@ -31,6 +31,7 @@ pub fn solarized() -> UserThemeFamily {
element_selected: Some(rgba(0x005a6fff).into()), element_selected: Some(rgba(0x005a6fff).into()),
drop_target_background: Some(rgba(0x00435388).into()), drop_target_background: Some(rgba(0x00435388).into()),
ghost_element_hover: Some(rgba(0x004353aa).into()), ghost_element_hover: Some(rgba(0x004353aa).into()),
text: Some(rgba(0xbbbbbbff).into()),
tab_inactive_background: Some(rgba(0x003f51ff).into()), tab_inactive_background: Some(rgba(0x003f51ff).into()),
tab_active_background: Some(rgba(0x002a36ff).into()), tab_active_background: Some(rgba(0x002a36ff).into()),
editor_background: Some(rgba(0x002a35ff).into()), editor_background: Some(rgba(0x002a35ff).into()),
@ -153,6 +154,7 @@ pub fn solarized() -> UserThemeFamily {
element_hover: Some(rgba(0xdec98744).into()), element_hover: Some(rgba(0xdec98744).into()),
element_selected: Some(rgba(0xdec987ff).into()), element_selected: Some(rgba(0xdec987ff).into()),
ghost_element_hover: Some(rgba(0xdec98744).into()), ghost_element_hover: Some(rgba(0xdec98744).into()),
text: Some(rgba(0x333333ff).into()),
tab_inactive_background: Some(rgba(0xd3cbb7ff).into()), tab_inactive_background: Some(rgba(0xd3cbb7ff).into()),
tab_active_background: Some(rgba(0xfdf6e3ff).into()), tab_active_background: Some(rgba(0xfdf6e3ff).into()),
editor_background: Some(rgba(0xfdf6e3ff).into()), editor_background: Some(rgba(0xfdf6e3ff).into()),

12
crates/theme_importer/src/vscode/converter.rs
View file

@ -157,7 +157,17 @@ impl VsCodeThemeConverter {
text: vscode_colors text: vscode_colors
.foreground .foreground
.as_ref() .as_ref()
.traverse(|color| try_parse_color(&color))?, .traverse(|color| try_parse_color(&color))?
.or_else(|| {
self.theme
.token_colors
.iter()
.find(|token_color| token_color.scope.is_none())
.and_then(|token_color| token_color.settings.foreground.as_ref())
.traverse(|color| try_parse_color(&color))
.ok()
.flatten()
}),
tab_active_background: vscode_colors tab_active_background: vscode_colors
.tab_active_background .tab_active_background
.as_ref() .as_ref()