Continue refining default syntax theme

Nate Butler created

Change summary

crates/theme2/src/default_colors.rs | 174 +++++++++++++-----------------
1 file changed, 78 insertions(+), 96 deletions(-)

Detailed changes

crates/theme2/src/default_colors.rs 🔗

@@ -84,54 +84,45 @@ impl SyntaxTheme {
     pub fn default_light() -> Self {
         Self {
             highlights: vec![
-                (
-                    "string.special.symbol".into(),
-                    gpui2::rgba(0xad6e26ff).into(),
-                ),
-                ("hint".into(), gpui2::rgba(0x9294beff).into()),
-                ("link_uri".into(), gpui2::rgba(0x3882b7ff).into()),
-                ("type".into(), gpui2::rgba(0x3882b7ff).into()),
-                ("string.regex".into(), gpui2::rgba(0xad6e26ff).into()),
-                ("constant".into(), gpui2::rgba(0x669f59ff).into()),
-                ("function".into(), gpui2::rgba(0x5b79e3ff).into()),
-                ("string.special".into(), gpui2::rgba(0xad6e26ff).into()),
-                ("punctuation.bracket".into(), gpui2::rgba(0x4d4f52ff).into()),
-                ("variable".into(), gpui2::rgba(0x383a41ff).into()),
-                ("punctuation".into(), gpui2::rgba(0x383a41ff).into()),
-                ("property".into(), gpui2::rgba(0xd3604fff).into()),
-                ("string".into(), gpui2::rgba(0x649f57ff).into()),
-                ("predictive".into(), gpui2::rgba(0x9b9ec6ff).into()),
-                ("attribute".into(), gpui2::rgba(0x5c78e2ff).into()),
-                ("number".into(), gpui2::rgba(0xad6e25ff).into()),
-                ("constructor".into(), gpui2::rgba(0x5c78e2ff).into()),
-                ("embedded".into(), gpui2::rgba(0x383a41ff).into()),
-                ("title".into(), gpui2::rgba(0xd3604fff).into()),
-                ("tag".into(), gpui2::rgba(0x5c78e2ff).into()),
-                ("boolean".into(), gpui2::rgba(0xad6e25ff).into()),
-                (
-                    "punctuation.list_marker".into(),
-                    gpui2::rgba(0xd3604fff).into(),
-                ),
-                ("variant".into(), gpui2::rgba(0x5b79e3ff).into()),
-                ("emphasis".into(), gpui2::rgba(0x5c78e2ff).into()),
-                ("link_text".into(), gpui2::rgba(0x5b79e3ff).into()),
-                ("comment".into(), gpui2::rgba(0xa2a3a7ff).into()),
-                ("punctuation.special".into(), gpui2::rgba(0xb92b46ff).into()),
-                ("emphasis.strong".into(), gpui2::rgba(0xad6e25ff).into()),
-                ("primary".into(), gpui2::rgba(0x383a41ff).into()),
-                (
-                    "punctuation.delimiter".into(),
-                    gpui2::rgba(0x4d4f52ff).into(),
-                ),
-                ("label".into(), gpui2::rgba(0x5c78e2ff).into()),
-                ("keyword".into(), gpui2::rgba(0xa449abff).into()),
-                ("string.escape".into(), gpui2::rgba(0x7c7e86ff).into()),
-                ("text.literal".into(), gpui2::rgba(0x649f57ff).into()),
-                ("variable.special".into(), gpui2::rgba(0xad6e25ff).into()),
-                ("comment.doc".into(), gpui2::rgba(0x7c7e86ff).into()),
-                ("enum".into(), gpui2::rgba(0xd3604fff).into()),
-                ("operator".into(), gpui2::rgba(0x3882b7ff).into()),
-                ("preproc".into(), gpui2::rgba(0x383a41ff).into()),
+                ("attribute".into(), cyan().light(11).into()),
+                ("boolean".into(), tomato().light(11).into()),
+                ("comment".into(), neutral().light(11).into()),
+                ("comment.doc".into(), iris().light(12).into()),
+                ("constant".into(), red().light(7).into()),
+                ("constructor".into(), red().light(7).into()),
+                ("embedded".into(), red().light(7).into()),
+                ("emphasis".into(), red().light(7).into()),
+                ("emphasis.strong".into(), red().light(7).into()),
+                ("enum".into(), red().light(7).into()),
+                ("function".into(), red().light(7).into()),
+                ("hint".into(), red().light(7).into()),
+                ("keyword".into(), orange().light(11).into()),
+                ("label".into(), red().light(7).into()),
+                ("link_text".into(), red().light(7).into()),
+                ("link_uri".into(), red().light(7).into()),
+                ("number".into(), red().light(7).into()),
+                ("operator".into(), red().light(7).into()),
+                ("predictive".into(), red().light(7).into()),
+                ("preproc".into(), red().light(7).into()),
+                ("primary".into(), red().light(7).into()),
+                ("property".into(), red().light(7).into()),
+                ("punctuation".into(), neutral().light(11).into()),
+                ("punctuation.bracket".into(), neutral().light(11).into()),
+                ("punctuation.delimiter".into(), neutral().light(11).into()),
+                ("punctuation.list_marker".into(), blue().light(11).into()),
+                ("punctuation.special".into(), red().light(7).into()),
+                ("string".into(), jade().light(11).into()),
+                ("string.escape".into(), red().light(7).into()),
+                ("string.regex".into(), tomato().light(11).into()),
+                ("string.special".into(), red().light(7).into()),
+                ("string.special.symbol".into(), red().light(7).into()),
+                ("tag".into(), red().light(7).into()),
+                ("text.literal".into(), red().light(7).into()),
+                ("title".into(), red().light(7).into()),
+                ("type".into(), red().light(7).into()),
+                ("variable".into(), red().light(7).into()),
+                ("variable.special".into(), red().light(7).into()),
+                ("variant".into(), red().light(7).into()),
             ],
         }
     }
@@ -139,54 +130,45 @@ impl SyntaxTheme {
     pub fn default_dark() -> Self {
         Self {
             highlights: vec![
-                ("keyword".into(), gpui2::rgba(0xb477cfff).into()),
-                ("comment.doc".into(), gpui2::rgba(0x878e98ff).into()),
-                ("variant".into(), gpui2::rgba(0x73ade9ff).into()),
-                ("property".into(), gpui2::rgba(0xd07277ff).into()),
-                ("function".into(), gpui2::rgba(0x73ade9ff).into()),
-                ("type".into(), gpui2::rgba(0x6eb4bfff).into()),
-                ("tag".into(), gpui2::rgba(0x74ade8ff).into()),
-                ("string.escape".into(), gpui2::rgba(0x878e98ff).into()),
-                ("punctuation.bracket".into(), gpui2::rgba(0xb2b9c6ff).into()),
-                ("hint".into(), gpui2::rgba(0x5a6f89ff).into()),
-                ("punctuation".into(), gpui2::rgba(0xacb2beff).into()),
-                ("comment".into(), gpui2::rgba(0x5d636fff).into()),
-                ("emphasis".into(), gpui2::rgba(0x74ade8ff).into()),
-                ("punctuation.special".into(), gpui2::rgba(0xb1574bff).into()),
-                ("link_uri".into(), gpui2::rgba(0x6eb4bfff).into()),
-                ("string.regex".into(), gpui2::rgba(0xbf956aff).into()),
-                ("constructor".into(), gpui2::rgba(0x73ade9ff).into()),
-                ("operator".into(), gpui2::rgba(0x6eb4bfff).into()),
-                ("constant".into(), gpui2::rgba(0xdfc184ff).into()),
-                ("string.special".into(), gpui2::rgba(0xbf956aff).into()),
-                ("emphasis.strong".into(), gpui2::rgba(0xbf956aff).into()),
-                (
-                    "string.special.symbol".into(),
-                    gpui2::rgba(0xbf956aff).into(),
-                ),
-                ("primary".into(), gpui2::rgba(0xacb2beff).into()),
-                ("preproc".into(), gpui2::rgba(0xc8ccd4ff).into()),
-                ("string".into(), gpui2::rgba(0xa1c181ff).into()),
-                (
-                    "punctuation.delimiter".into(),
-                    gpui2::rgba(0xb2b9c6ff).into(),
-                ),
-                ("embedded".into(), gpui2::rgba(0xc8ccd4ff).into()),
-                ("enum".into(), gpui2::rgba(0xd07277ff).into()),
-                ("variable.special".into(), gpui2::rgba(0xbf956aff).into()),
-                ("text.literal".into(), gpui2::rgba(0xa1c181ff).into()),
-                ("attribute".into(), gpui2::rgba(0x74ade8ff).into()),
-                ("link_text".into(), gpui2::rgba(0x73ade9ff).into()),
-                ("title".into(), gpui2::rgba(0xd07277ff).into()),
-                ("predictive".into(), gpui2::rgba(0x5a6a87ff).into()),
-                ("number".into(), gpui2::rgba(0xbf956aff).into()),
-                ("label".into(), gpui2::rgba(0x74ade8ff).into()),
-                ("variable".into(), gpui2::rgba(0xc8ccd4ff).into()),
-                ("boolean".into(), gpui2::rgba(0xbf956aff).into()),
-                (
-                    "punctuation.list_marker".into(),
-                    gpui2::rgba(0xd07277ff).into(),
-                ),
+                ("attribute".into(), cyan().dark(11).into()),
+                ("boolean".into(), tomato().dark(11).into()),
+                ("comment".into(), neutral().dark(11).into()),
+                ("comment.doc".into(), iris().dark(12).into()),
+                ("constant".into(), red().dark(7).into()),
+                ("constructor".into(), red().dark(7).into()),
+                ("embedded".into(), red().dark(7).into()),
+                ("emphasis".into(), red().dark(7).into()),
+                ("emphasis.strong".into(), red().dark(7).into()),
+                ("enum".into(), red().dark(7).into()),
+                ("function".into(), red().dark(7).into()),
+                ("hint".into(), red().dark(7).into()),
+                ("keyword".into(), orange().dark(11).into()),
+                ("label".into(), red().dark(7).into()),
+                ("link_text".into(), red().dark(7).into()),
+                ("link_uri".into(), red().dark(7).into()),
+                ("number".into(), red().dark(7).into()),
+                ("operator".into(), red().dark(7).into()),
+                ("predictive".into(), red().dark(7).into()),
+                ("preproc".into(), red().dark(7).into()),
+                ("primary".into(), red().dark(7).into()),
+                ("property".into(), red().dark(7).into()),
+                ("punctuation".into(), neutral().dark(11).into()),
+                ("punctuation.bracket".into(), neutral().dark(11).into()),
+                ("punctuation.delimiter".into(), neutral().dark(11).into()),
+                ("punctuation.list_marker".into(), blue().dark(11).into()),
+                ("punctuation.special".into(), red().dark(7).into()),
+                ("string".into(), jade().dark(11).into()),
+                ("string.escape".into(), red().dark(7).into()),
+                ("string.regex".into(), tomato().dark(11).into()),
+                ("string.special".into(), red().dark(7).into()),
+                ("string.special.symbol".into(), red().dark(7).into()),
+                ("tag".into(), red().dark(7).into()),
+                ("text.literal".into(), red().dark(7).into()),
+                ("title".into(), red().dark(7).into()),
+                ("type".into(), red().dark(7).into()),
+                ("variable".into(), red().dark(7).into()),
+                ("variable.special".into(), red().dark(7).into()),
+                ("variant".into(), red().dark(7).into()),
             ],
         }
     }