oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish passing Syntax from VSCode themes to Zed Themes

Browse Source 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
This commit is contained in:
Nate Butler
2023-11-09 14:41:26 -05:00
co-authored by Marshall Bowers
parent ff053890cf
commit 54157eb99a
20 changed files with 1795 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/theme2/src/registry.rs
+28 -7
View File
@@ -2,7 +2,7 @@ use std::collections::HashMap;
use std::sync::Arc;
use anyhow::{anyhow, Result};
use gpui::SharedString;
use gpui::{HighlightStyle, SharedString};
use refineable::Refineable;
use crate::{
@@ -39,9 +39,33 @@ impl ThemeRegistry {
Appearance::Light => ThemeColors::default_light(),
Appearance::Dark => ThemeColors::default_dark(),
};
theme_colors.refine(&user_theme.styles.colors);
let mut status_colors = StatusColors::default();
status_colors.refine(&user_theme.styles.status);
let mut syntax_colors = match user_theme.appearance {
Appearance::Light => SyntaxTheme::default_light(),
Appearance::Dark => SyntaxTheme::default_dark(),
};
if let Some(user_syntax) = user_theme.styles.syntax {
syntax_colors.highlights = user_syntax
.highlights
.iter()
.map(|(syntax_token, highlight)| {
(
syntax_token.clone(),
HighlightStyle {
color: highlight.color,
font_style: highlight.font_style.map(Into::into),
font_weight: highlight.font_weight.map(Into::into),
..Default::default()
},
)
})
.collect::<Vec<_>>();
}
Theme {
id: uuid::Uuid::new_v4().to_string(),
name: user_theme.name.into(),
@@ -49,12 +73,9 @@ impl ThemeRegistry {
styles: ThemeStyles {
system: SystemColors::default(),
colors: theme_colors,
status: StatusColors::default(),
status: status_colors,
player: PlayerColors::default(),
syntax: match user_theme.appearance {
Appearance::Light => Arc::new(SyntaxTheme::default_light()),
Appearance::Dark => Arc::new(SyntaxTheme::default_dark()),
},
syntax: Arc::new(syntax_colors),
},
}
}));
crates/theme2/src/themes/andromeda.rs
+51 -8
View File
@@ -3,9 +3,10 @@
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserHighlightStyle, UserSyntaxTheme,
UserTheme, UserThemeFamily, UserThemeStylesRefinement,
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn andromeda() -> UserThemeFamily {
@@ -61,6 +62,13 @@ pub fn andromeda() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c11ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -69,16 +77,30 @@ pub fn andromeda() -> UserThemeFamily {
},
),
(
"something".into(),
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xffe66dff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xc64dedff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x95e072ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x95e072ff).into()),
color: Some(rgba(0xffe66dff).into()),
..Default::default()
},
),
@@ -134,6 +156,13 @@ pub fn andromeda() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c11ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -142,16 +171,30 @@ pub fn andromeda() -> UserThemeFamily {
},
),
(
"something".into(),
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xffe66dff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xc64dedff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x95e072ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x95e072ff).into()),
color: Some(rgba(0xffe66dff).into()),
..Default::default()
},
),
crates/theme2/src/themes/ayu.rs
+120 -11
View File
@@ -3,9 +3,10 @@
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserHighlightStyle, UserSyntaxTheme,
UserTheme, UserThemeFamily, UserThemeStylesRefinement,
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn ayu() -> UserThemeFamily {
@@ -65,6 +66,20 @@ pub fn ayu() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xf2ad48ff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0xa37accff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -74,16 +89,38 @@ pub fn ayu() -> UserThemeFamily {
},
),
(
"something".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x4bbf98ff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xf2ad48ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xfa8d3eff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x787b8099).into()),
color: Some(rgba(0x86b300ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x55b4d3ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
@@ -143,6 +180,20 @@ pub fn ayu() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xffd173ff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0xdfbfffff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -152,16 +203,38 @@ pub fn ayu() -> UserThemeFamily {
},
),
(
"something".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x95e6cbff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xffd173ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xffad65ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xb8cfe680).into()),
color: Some(rgba(0xd4fe7fff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x5ccfe6ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
@@ -221,6 +294,20 @@ pub fn ayu() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xffb353ff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0xd2a6ffff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -230,16 +317,38 @@ pub fn ayu() -> UserThemeFamily {
},
),
(
"something".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x95e6cbff).into()),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xffb353ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xff8f3fff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xabb5be8c).into()),
color: Some(rgba(0xa9d94bff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x38b9e6ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
crates/theme2/src/themes/dracula.rs
+44 -5
View File
@@ -3,9 +3,10 @@
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserHighlightStyle, UserSyntaxTheme,
UserTheme, UserThemeFamily, UserThemeStylesRefinement,
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn dracula() -> UserThemeFamily {
@@ -66,6 +67,14 @@ pub fn dracula() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x50fa7bff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -74,19 +83,49 @@ pub fn dracula() -> UserThemeFamily {
},
),
(
"something".into(),
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0xf8f8f2ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"punctuation".into(),
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x50fa7bff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xff79c6ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xf1fa8cff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x8be9fdff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xbd93f9ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
],
}),
},
crates/theme2/src/themes/gruvbox.rs
+273 -20
View File
@@ -3,9 +3,10 @@
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserHighlightStyle, UserSyntaxTheme,
UserTheme, UserThemeFamily, UserThemeStylesRefinement,
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn gruvbox() -> UserThemeFamily {
@@ -64,6 +65,13 @@ pub fn gruvbox() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xfabd2eff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -73,16 +81,51 @@ pub fn gruvbox() -> UserThemeFamily {
},
),
(
"something".into(),
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xfabd2eff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xfb4833ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
color: Some(rgba(0xa89984ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xb8bb25ff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0xfb4833ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xfabd2eff).into()),
..Default::default()
},
),
@@ -141,6 +184,13 @@ pub fn gruvbox() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xfabd2eff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -150,16 +200,51 @@ pub fn gruvbox() -> UserThemeFamily {
},
),
(
"something".into(),
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xfabd2eff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xfb4833ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
color: Some(rgba(0xa89984ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xb8bb25ff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0xfb4833ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xfabd2eff).into()),
..Default::default()
},
),
@@ -218,6 +303,13 @@ pub fn gruvbox() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xfabd2eff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -227,16 +319,51 @@ pub fn gruvbox() -> UserThemeFamily {
},
),
(
"something".into(),
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xfabd2eff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xfb4833ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
color: Some(rgba(0xa89984ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xb8bb25ff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0xfb4833ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xfabd2eff).into()),
..Default::default()
},
),
@@ -295,6 +422,13 @@ pub fn gruvbox() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xb57613ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -304,16 +438,51 @@ pub fn gruvbox() -> UserThemeFamily {
},
),
(
"something".into(),
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0x066578ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xb57613ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x9d0006ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x066578ff).into()),
color: Some(rgba(0x7c6f64ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x79740eff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0x9d0006ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xb57613ff).into()),
..Default::default()
},
),
@@ -372,6 +541,13 @@ pub fn gruvbox() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xb57613ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -381,16 +557,51 @@ pub fn gruvbox() -> UserThemeFamily {
},
),
(
"something".into(),
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0x066578ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xb57613ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x9d0006ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x066578ff).into()),
color: Some(rgba(0x7c6f64ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x79740eff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0x9d0006ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xb57613ff).into()),
..Default::default()
},
),
@@ -449,6 +660,13 @@ pub fn gruvbox() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xb57613ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -458,16 +676,51 @@ pub fn gruvbox() -> UserThemeFamily {
},
),
(
"something".into(),
"emphasis".into(),
UserHighlightStyle {
color: Some(rgba(0x066578ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xb57613ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x9d0006ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x066578ff).into()),
color: Some(rgba(0x7c6f64ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x79740eff).into()),
..Default::default()
},
),
(
"string.escape".into(),
UserHighlightStyle {
color: Some(rgba(0x9d0006ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xb57613ff).into()),
..Default::default()
},
),
crates/theme2/src/themes/mod.rs
+3 -3
View File
@@ -6,8 +6,8 @@ mod ayu;
mod dracula;
mod gruvbox;
mod night_owl;
mod noctis;
mod nord;
mod notctis;
mod palenight;
mod rose_pine;
mod solarized;
@@ -18,8 +18,8 @@ pub use ayu::*;
pub use dracula::*;
pub use gruvbox::*;
pub use night_owl::*;
pub use noctis::*;
pub use nord::*;
pub use notctis::*;
pub use palenight::*;
pub use rose_pine::*;
pub use solarized::*;
@@ -37,7 +37,7 @@ pub(crate) fn all_user_themes() -> Vec<UserThemeFamily> {
dracula(),
solarized(),
nord(),
notctis(),
noctis(),
ayu(),
gruvbox(),
]
crates/theme2/src/themes/night_owl.rs
+87 -10
View File
@@ -3,9 +3,10 @@
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserHighlightStyle, UserSyntaxTheme,
UserTheme, UserThemeFamily, UserThemeStylesRefinement,
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn night_owl() -> UserThemeFamily {
@@ -65,6 +66,21 @@ pub fn night_owl() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xc5e478ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -74,16 +90,39 @@ pub fn night_owl() -> UserThemeFamily {
},
),
(
"something".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x7fcac3ff).into()),
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xd3413dff).into()),
color: Some(rgba(0xc792eaff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xecc48dff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x7fdbcaff).into()),
..Default::default()
},
),
@@ -144,6 +183,21 @@ pub fn night_owl() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -153,16 +207,39 @@ pub fn night_owl() -> UserThemeFamily {
},
),
(
"something".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x0b969bff).into()),
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xd3413dff).into()),
color: Some(rgba(0x994bc3ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x994bc3ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x0b969bff).into()),
..Default::default()
},
),
crates/theme2/src/themes/notctis.rs → crates/theme2/src/themes/noctis.rs
+423 -37
View File
@@ -3,14 +3,15 @@
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserHighlightStyle, UserSyntaxTheme,
UserTheme, UserThemeFamily, UserThemeStylesRefinement,
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn notctis() -> UserThemeFamily {
pub fn noctis() -> UserThemeFamily {
UserThemeFamily {
name: "Notctis".into(),
name: "Noctis".into(),
author: "Liviu Schera (liviuschera)".into(),
themes: vec![
UserTheme {
@@ -67,6 +68,13 @@ pub fn notctis() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x705febff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -75,19 +83,47 @@ pub fn notctis() -> UserThemeFamily {
},
),
(
"punctuation".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x49ace9ff).into()),
color: Some(rgba(0xbecfdaff).into()),
..Default::default()
},
),
(
"something".into(),
"constructor".into(),
UserHighlightStyle {
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x15a2b6ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xdf759aff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x49e9a6ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xe66432ff).into()),
..Default::default()
},
),
],
}),
},
@@ -146,6 +182,13 @@ pub fn notctis() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x705febff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -154,19 +197,47 @@ pub fn notctis() -> UserThemeFamily {
},
),
(
"punctuation".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x49ace9ff).into()),
color: Some(rgba(0xcbbec2ff).into()),
..Default::default()
},
),
(
"something".into(),
"constructor".into(),
UserHighlightStyle {
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x15a2b6ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xdf759aff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x49e9a6ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xe66432ff).into()),
..Default::default()
},
),
],
}),
},
@@ -225,6 +296,13 @@ pub fn notctis() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x5841ffff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -233,19 +311,47 @@ pub fn notctis() -> UserThemeFamily {
},
),
(
"punctuation".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x0094f0ff).into()),
color: Some(rgba(0x004d57ff).into()),
..Default::default()
},
),
(
"something".into(),
"constructor".into(),
UserHighlightStyle {
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x0094a8ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xff5792ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x00b368ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xe64100ff).into()),
..Default::default()
},
),
],
}),
},
@@ -304,6 +410,13 @@ pub fn notctis() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x5841ffff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -312,19 +425,47 @@ pub fn notctis() -> UserThemeFamily {
},
),
(
"punctuation".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x0094f0ff).into()),
color: Some(rgba(0x0c006bff).into()),
..Default::default()
},
),
(
"something".into(),
"constructor".into(),
UserHighlightStyle {
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x0094a8ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xff5792ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x00b368ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xe64100ff).into()),
..Default::default()
},
),
],
}),
},
@@ -383,6 +524,13 @@ pub fn notctis() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x5841ffff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -391,19 +539,47 @@ pub fn notctis() -> UserThemeFamily {
},
),
(
"punctuation".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x0094f0ff).into()),
color: Some(rgba(0x004d57ff).into()),
..Default::default()
},
),
(
"something".into(),
"constructor".into(),
UserHighlightStyle {
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x0094a8ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xff5792ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x00b368ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xe64100ff).into()),
..Default::default()
},
),
],
}),
},
@@ -462,6 +638,13 @@ pub fn notctis() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x7067b1ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -470,19 +653,47 @@ pub fn notctis() -> UserThemeFamily {
},
),
(
"punctuation".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x5897bfff).into()),
color: Some(rgba(0xc5cdd3ff).into()),
..Default::default()
},
),
(
"something".into(),
"constructor".into(),
UserHighlightStyle {
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x3e848dff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xc88da2ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x72c09fff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xc37455ff).into()),
..Default::default()
},
),
],
}),
},
@@ -541,6 +752,13 @@ pub fn notctis() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x705febff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -549,19 +767,47 @@ pub fn notctis() -> UserThemeFamily {
},
),
(
"punctuation".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x49ace9ff).into()),
color: Some(rgba(0xb1c9ccff).into()),
..Default::default()
},
),
(
"something".into(),
"constructor".into(),
UserHighlightStyle {
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x15a2b6ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xdf759aff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x49e9a6ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xe66432ff).into()),
..Default::default()
},
),
],
}),
},
@@ -620,6 +866,13 @@ pub fn notctis() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x705febff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -628,19 +881,47 @@ pub fn notctis() -> UserThemeFamily {
},
),
(
"punctuation".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x49ace9ff).into()),
color: Some(rgba(0xb1c9ccff).into()),
..Default::default()
},
),
(
"something".into(),
"constructor".into(),
UserHighlightStyle {
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x15a2b6ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xdf759aff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x49e9a6ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xe66432ff).into()),
..Default::default()
},
),
],
}),
},
@@ -699,6 +980,13 @@ pub fn notctis() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x705febff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -707,19 +995,47 @@ pub fn notctis() -> UserThemeFamily {
},
),
(
"punctuation".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x49ace9ff).into()),
color: Some(rgba(0xb1c9ccff).into()),
..Default::default()
},
),
(
"something".into(),
"constructor".into(),
UserHighlightStyle {
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x15a2b6ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xdf759aff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x49e9a6ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xe66432ff).into()),
..Default::default()
},
),
],
}),
},
@@ -778,6 +1094,13 @@ pub fn notctis() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x705febff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -786,19 +1109,47 @@ pub fn notctis() -> UserThemeFamily {
},
),
(
"punctuation".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x49ace9ff).into()),
color: Some(rgba(0xc5c2d6ff).into()),
..Default::default()
},
),
(
"something".into(),
"constructor".into(),
UserHighlightStyle {
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x15a2b6ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xdf759aff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x49e9a6ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xe66432ff).into()),
..Default::default()
},
),
],
}),
},
@@ -857,6 +1208,13 @@ pub fn notctis() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x705febff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -865,19 +1223,47 @@ pub fn notctis() -> UserThemeFamily {
},
),
(
"punctuation".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x49ace9ff).into()),
color: Some(rgba(0xccbfd9ff).into()),
..Default::default()
},
),
(
"something".into(),
"constructor".into(),
UserHighlightStyle {
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x15a2b6ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xdf759aff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x49e9a6ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xe66432ff).into()),
..Default::default()
},
),
],
}),
},
crates/theme2/src/themes/nord.rs
+54 -4
View File
@@ -3,9 +3,10 @@
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserHighlightStyle, UserSyntaxTheme,
UserTheme, UserThemeFamily, UserThemeStylesRefinement,
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn nord() -> UserThemeFamily {
@@ -66,6 +67,20 @@ pub fn nord() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x8fbcbbff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -74,19 +89,54 @@ pub fn nord() -> UserThemeFamily {
},
),
(
"punctuation".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0xebcb8bff).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x88bfd0ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
(
"something".into(),
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xeceff4ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xa3be8cff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
],
}),
},
crates/theme2/src/themes/palenight.rs
+120 -14
View File
@@ -3,9 +3,10 @@
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserHighlightStyle, UserSyntaxTheme,
UserTheme, UserThemeFamily, UserThemeStylesRefinement,
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn palenight() -> UserThemeFamily {
@@ -65,6 +66,20 @@ pub fn palenight() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xffcb6bff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -74,16 +89,37 @@ pub fn palenight() -> UserThemeFamily {
},
),
(
"something".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x7fcac3ff).into()),
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xd3413dff).into()),
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xc3e88dff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xff5571ff).into()),
..Default::default()
},
),
@@ -143,6 +179,20 @@ pub fn palenight() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xffcb6bff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -152,16 +202,37 @@ pub fn palenight() -> UserThemeFamily {
},
),
(
"something".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x7fcac3ff).into()),
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xd3413dff).into()),
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xc3e88dff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xff5571ff).into()),
..Default::default()
},
),
@@ -221,6 +292,20 @@ pub fn palenight() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xffcb6bff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -230,16 +315,37 @@ pub fn palenight() -> UserThemeFamily {
},
),
(
"something".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x7fcac3ff).into()),
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xd3413dff).into()),
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xc3e88dff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xff5571ff).into()),
..Default::default()
},
),
crates/theme2/src/themes/rose_pine.rs
+120 -14
View File
@@ -3,9 +3,10 @@
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserHighlightStyle, UserSyntaxTheme,
UserTheme, UserThemeFamily, UserThemeStylesRefinement,
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn rose_pine() -> UserThemeFamily {
@@ -66,6 +67,21 @@ pub fn rose_pine() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xc4a7e7ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0xebbcbaff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -75,17 +91,37 @@ pub fn rose_pine() -> UserThemeFamily {
},
),
(
"something".into(),
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xebbcbaff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0x30738fff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x6e6a86ff).into()),
color: Some(rgba(0x908caaff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xf5c177ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x9ccfd8ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xe0def4ff).into()),
..Default::default()
},
),
@@ -146,6 +182,21 @@ pub fn rose_pine() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xc4a7e7ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0xea9a97ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -155,17 +206,37 @@ pub fn rose_pine() -> UserThemeFamily {
},
),
(
"something".into(),
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xea9a97ff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0x3d8fb0ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x6e6a86ff).into()),
color: Some(rgba(0x908caaff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xf5c177ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x9ccfd8ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xe0def4ff).into()),
..Default::default()
},
),
@@ -226,6 +297,21 @@ pub fn rose_pine() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x9079a9ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0xd7827dff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -235,17 +321,37 @@ pub fn rose_pine() -> UserThemeFamily {
},
),
(
"something".into(),
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xd7827dff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0x276983ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x9893a5ff).into()),
color: Some(rgba(0x797593ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0xea9d34ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x55949fff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x575279ff).into()),
..Default::default()
},
),
crates/theme2/src/themes/solarized.rs
+102 -11
View File
@@ -3,9 +3,10 @@
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserHighlightStyle, UserSyntaxTheme,
UserTheme, UserThemeFamily, UserThemeStylesRefinement,
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn solarized() -> UserThemeFamily {
@@ -61,6 +62,20 @@ pub fn solarized() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x93a1a1ff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0xb58800ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -70,17 +85,51 @@ pub fn solarized() -> UserThemeFamily {
},
),
(
"something".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x93a1a1ff).into()),
font_weight: Some(UserFontWeight(700.0)),
color: Some(rgba(0xcb4b15ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x657b83ff).into()),
color: Some(rgba(0x258ad2ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x859900ff).into()),
..Default::default()
},
),
(
"property".into(),
UserHighlightStyle {
color: Some(rgba(0x839496ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x29a198ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xcb4b15ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x258ad2ff).into()),
..Default::default()
},
),
@@ -133,6 +182,20 @@ pub fn solarized() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0x93a1a1ff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0xb58800ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -142,16 +205,44 @@ pub fn solarized() -> UserThemeFamily {
},
),
(
"something".into(),
"constant".into(),
UserHighlightStyle {
color: Some(rgba(0x657b83ff).into()),
color: Some(rgba(0xcb4b15ff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x93a1a1ff).into()),
color: Some(rgba(0x258ad2ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x859900ff).into()),
..Default::default()
},
),
(
"string".into(),
UserHighlightStyle {
color: Some(rgba(0x29a198ff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x258ad2ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x258ad2ff).into()),
..Default::default()
},
),
crates/theme2/src/themes/synthwave_84.rs
+35 -5
View File
@@ -3,9 +3,10 @@
use gpui::rgba;
#[allow(unused)]
use crate::{
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserHighlightStyle, UserSyntaxTheme,
UserTheme, UserThemeFamily, UserThemeStylesRefinement,
Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
};
pub fn synthwave_84() -> UserThemeFamily {
@@ -51,6 +52,20 @@ pub fn synthwave_84() -> UserThemeFamily {
},
syntax: Some(UserSyntaxTheme {
highlights: vec![
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xfede5cff).into()),
..Default::default()
},
),
(
"boolean".into(),
UserHighlightStyle {
color: Some(rgba(0xf97d71ff).into()),
..Default::default()
},
),
(
"comment".into(),
UserHighlightStyle {
@@ -60,16 +75,31 @@ pub fn synthwave_84() -> UserThemeFamily {
},
),
(
"something".into(),
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x35f9f5ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xfede5cff).into()),
..Default::default()
},
),
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xfe444fff).into()),
..Default::default()
},
),
(
"punctuation".into(),
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xfede5cff).into()),
color: Some(rgba(0xfe444fff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),
crates/theme2/src/user_theme.rs
+19 -3
View File
@@ -1,4 +1,4 @@
use gpui::{FontWeight, Hsla};
use gpui::{FontStyle, FontWeight, Hsla};
use refineable::Refineable;
use serde::Deserialize;
@@ -40,7 +40,7 @@ pub struct UserHighlightStyle {
pub font_weight: Option<UserFontWeight>,
}
#[derive(Clone, Default, Deserialize)]
#[derive(Clone, Copy, Default, Deserialize)]
pub struct UserFontWeight(pub f32);
impl UserFontWeight {
@@ -64,6 +64,12 @@ impl UserFontWeight {
pub const BLACK: Self = Self(FontWeight::BLACK.0);
}
impl From<UserFontWeight> for FontWeight {
fn from(value: UserFontWeight) -> Self {
Self(value.0)
}
}
#[derive(Debug, Clone, Copy, Deserialize)]
pub enum UserFontStyle {
Normal,
@@ -71,8 +77,18 @@ pub enum UserFontStyle {
Oblique,
}
impl From<UserFontStyle> for FontStyle {
fn from(value: UserFontStyle) -> Self {
match value {
UserFontStyle::Normal => FontStyle::Normal,
UserFontStyle::Italic => FontStyle::Italic,
UserFontStyle::Oblique => FontStyle::Oblique,
}
}
}
impl UserHighlightStyle {
pub fn is_empty(&self) -> bool {
self.color.is_none()
self.color.is_none() && self.font_style.is_none() && self.font_weight.is_none()
}
}