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

theme_importer: Improve syntax token matching (#3549)

Browse Source 
This PR improves the approach we use to match syntax tokens between Zed
and VS Code in the `theme_importer`.

We now use the list of scopes assigned to each Zed syntax token to rank
the possible candidates in the VS Code and then pick the candidate with
the highest rank.

So far this has proved to provide better colors across the board, but
we'll continue to refine the matching over time.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers
2023-12-07 22:11:31 -05:00
committed by GitHub
parent 89f62a1a69
commit f272881a6b
14 changed files with 520 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/theme2/src/themes/andromeda.rs
+32 -4
View File
@@ -66,7 +66,7 @@ pub fn andromeda() -> UserThemeFamily {
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c12ff).into()),
color: Some(rgba(0xffe66dff).into()),
..Default::default()
},
),
@@ -77,6 +77,13 @@ pub fn andromeda() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0xa0a1a7cc).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
@@ -143,7 +150,7 @@ pub fn andromeda() -> UserThemeFamily {
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xffe66dff).into()),
color: Some(rgba(0xee5d43ff).into()),
..Default::default()
},
),
@@ -154,6 +161,13 @@ pub fn andromeda() -> UserThemeFamily {
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0x00e8c6ff).into()),
..Default::default()
},
),
],
}),
},
@@ -210,7 +224,7 @@ pub fn andromeda() -> UserThemeFamily {
(
"attribute".into(),
UserHighlightStyle {
color: Some(rgba(0xf39c12ff).into()),
color: Some(rgba(0xffe66dff).into()),
..Default::default()
},
),
@@ -221,6 +235,13 @@ pub fn andromeda() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0xa0a1a7cc).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
@@ -287,7 +308,7 @@ pub fn andromeda() -> UserThemeFamily {
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xffe66dff).into()),
color: Some(rgba(0xee5d43ff).into()),
..Default::default()
},
),
@@ -298,6 +319,13 @@ pub fn andromeda() -> UserThemeFamily {
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0x00e8c6ff).into()),
..Default::default()
},
),
],
}),
},
crates/theme2/src/themes/ayu.rs
+36 -12
View File
@@ -89,6 +89,14 @@ pub fn ayu() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x787b8099).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
@@ -122,14 +130,14 @@ pub fn ayu() -> UserThemeFamily {
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xf2ae49ff).into()),
color: Some(rgba(0xf07171ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xfa8d3eff).into()),
color: Some(rgba(0x55b4d4ff).into()),
..Default::default()
},
),
@@ -171,7 +179,7 @@ pub fn ayu() -> UserThemeFamily {
(
"property".into(),
UserHighlightStyle {
color: Some(rgba(0xf07171ff).into()),
color: Some(rgba(0x55b4d4ff).into()),
..Default::default()
},
),
@@ -269,7 +277,7 @@ pub fn ayu() -> UserThemeFamily {
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0xf07171ff).into()),
color: Some(rgba(0xf2ae49ff).into()),
..Default::default()
},
),
@@ -352,6 +360,14 @@ pub fn ayu() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0xb8cfe680).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
@@ -385,14 +401,14 @@ pub fn ayu() -> UserThemeFamily {
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xffd173ff).into()),
color: Some(rgba(0xf28779ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xffad66ff).into()),
color: Some(rgba(0x5ccfe6ff).into()),
..Default::default()
},
),
@@ -434,7 +450,7 @@ pub fn ayu() -> UserThemeFamily {
(
"property".into(),
UserHighlightStyle {
color: Some(rgba(0xf28779ff).into()),
color: Some(rgba(0x5ccfe6ff).into()),
..Default::default()
},
),
@@ -532,7 +548,7 @@ pub fn ayu() -> UserThemeFamily {
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0xf28779ff).into()),
color: Some(rgba(0xffd173ff).into()),
..Default::default()
},
),
@@ -615,6 +631,14 @@ pub fn ayu() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0xacb6bf8c).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
@@ -648,14 +672,14 @@ pub fn ayu() -> UserThemeFamily {
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xffb454ff).into()),
color: Some(rgba(0xf07178ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0xff8f40ff).into()),
color: Some(rgba(0x39bae6ff).into()),
..Default::default()
},
),
@@ -697,7 +721,7 @@ pub fn ayu() -> UserThemeFamily {
(
"property".into(),
UserHighlightStyle {
color: Some(rgba(0xf07178ff).into()),
color: Some(rgba(0x39bae6ff).into()),
..Default::default()
},
),
@@ -795,7 +819,7 @@ pub fn ayu() -> UserThemeFamily {
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0xf07178ff).into()),
color: Some(rgba(0xffb454ff).into()),
..Default::default()
},
),
crates/theme2/src/themes/dracula.rs
+8 -2
View File
@@ -83,6 +83,13 @@ pub fn dracula() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x6272a4ff).into()),
..Default::default()
},
),
(
"emphasis".into(),
UserHighlightStyle {
@@ -159,8 +166,7 @@ pub fn dracula() -> UserThemeFamily {
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xbd93f9ff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0xf8f8f2ff).into()),
..Default::default()
},
),
crates/theme2/src/themes/gruvbox.rs
+60 -12
View File
@@ -82,8 +82,9 @@ pub fn gruvbox() -> UserThemeFamily {
},
),
(
"emphasis".into(),
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x928374ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
@@ -148,7 +149,7 @@ pub fn gruvbox() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xa89984ff).into()),
color: Some(rgba(0x83a598ff).into()),
..Default::default()
},
),
@@ -201,6 +202,13 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
..Default::default()
},
),
],
}),
},
@@ -273,8 +281,9 @@ pub fn gruvbox() -> UserThemeFamily {
},
),
(
"emphasis".into(),
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x928374ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
@@ -339,7 +348,7 @@ pub fn gruvbox() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xa89984ff).into()),
color: Some(rgba(0x83a598ff).into()),
..Default::default()
},
),
@@ -392,6 +401,13 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
..Default::default()
},
),
],
}),
},
@@ -464,8 +480,9 @@ pub fn gruvbox() -> UserThemeFamily {
},
),
(
"emphasis".into(),
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x928374ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
@@ -530,7 +547,7 @@ pub fn gruvbox() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xa89984ff).into()),
color: Some(rgba(0x83a598ff).into()),
..Default::default()
},
),
@@ -583,6 +600,13 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0x83a598ff).into()),
..Default::default()
},
),
],
}),
},
@@ -655,8 +679,9 @@ pub fn gruvbox() -> UserThemeFamily {
},
),
(
"emphasis".into(),
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x928374ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
@@ -721,7 +746,7 @@ pub fn gruvbox() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x7c6f64ff).into()),
color: Some(rgba(0x076678ff).into()),
..Default::default()
},
),
@@ -774,6 +799,13 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0x076678ff).into()),
..Default::default()
},
),
],
}),
},
@@ -846,8 +878,9 @@ pub fn gruvbox() -> UserThemeFamily {
},
),
(
"emphasis".into(),
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x928374ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
@@ -912,7 +945,7 @@ pub fn gruvbox() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x7c6f64ff).into()),
color: Some(rgba(0x076678ff).into()),
..Default::default()
},
),
@@ -965,6 +998,13 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0x076678ff).into()),
..Default::default()
},
),
],
}),
},
@@ -1037,8 +1077,9 @@ pub fn gruvbox() -> UserThemeFamily {
},
),
(
"emphasis".into(),
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x928374ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
@@ -1103,7 +1144,7 @@ pub fn gruvbox() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x7c6f64ff).into()),
color: Some(rgba(0x076678ff).into()),
..Default::default()
},
),
@@ -1156,6 +1197,13 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default()
},
),
(
"variable.special".into(),
UserHighlightStyle {
color: Some(rgba(0x076678ff).into()),
..Default::default()
},
),
],
}),
},
crates/theme2/src/themes/night_owl.rs
+21 -9
View File
@@ -90,6 +90,14 @@ pub fn night_owl() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x637777ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
@@ -100,8 +108,7 @@ pub fn night_owl() -> UserThemeFamily {
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0x82aaffff).into()),
..Default::default()
},
),
@@ -137,8 +144,7 @@ pub fn night_owl() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0x7fdbcaff).into()),
..Default::default()
},
),
@@ -180,7 +186,7 @@ pub fn night_owl() -> UserThemeFamily {
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xc5e478ff).into()),
color: Some(rgba(0xd7dbe0ff).into()),
..Default::default()
},
),
@@ -272,6 +278,14 @@ pub fn night_owl() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x989fb1ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
@@ -282,8 +296,7 @@ pub fn night_owl() -> UserThemeFamily {
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x994cc3ff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0x4876d6ff).into()),
..Default::default()
},
),
@@ -320,7 +333,6 @@ pub fn night_owl() -> UserThemeFamily {
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x994cc3ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
@@ -362,7 +374,7 @@ pub fn night_owl() -> UserThemeFamily {
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x4876d6ff).into()),
color: Some(rgba(0x403f53ff).into()),
..Default::default()
},
),
crates/theme2/src/themes/noctis.rs
+143 -297
View File
File diff suppressed because it is too large Load Diff
crates/theme2/src/themes/nord.rs
+6 -6
View File
@@ -90,16 +90,16 @@ pub fn nord() -> UserThemeFamily {
},
),
(
"constant".into(),
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0xebcb8bff).into()),
color: Some(rgba(0x616e88ff).into()),
..Default::default()
},
),
(
"emphasis.strong".into(),
"constant".into(),
UserHighlightStyle {
font_weight: Some(UserFontWeight(700.0)),
color: Some(rgba(0xebcb8bff).into()),
..Default::default()
},
),
@@ -134,7 +134,7 @@ pub fn nord() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xeceff4ff).into()),
color: Some(rgba(0x81a1c1ff).into()),
..Default::default()
},
),
@@ -183,7 +183,7 @@ pub fn nord() -> UserThemeFamily {
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x81a1c1ff).into()),
color: Some(rgba(0xd8dee9ff).into()),
..Default::default()
},
),
crates/theme2/src/themes/palenight.rs
+30 -6
View File
@@ -89,6 +89,14 @@ pub fn palenight() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x697098ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
@@ -164,7 +172,7 @@ pub fn palenight() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
color: Some(rgba(0x89ddffff).into()),
..Default::default()
},
),
@@ -206,7 +214,7 @@ pub fn palenight() -> UserThemeFamily {
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xffcb6bff).into()),
color: Some(rgba(0xff5572ff).into()),
..Default::default()
},
),
@@ -296,6 +304,14 @@ pub fn palenight() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x697098ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
@@ -371,7 +387,7 @@ pub fn palenight() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
color: Some(rgba(0x89ddffff).into()),
..Default::default()
},
),
@@ -413,7 +429,7 @@ pub fn palenight() -> UserThemeFamily {
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xffcb6bff).into()),
color: Some(rgba(0xff5572ff).into()),
..Default::default()
},
),
@@ -503,6 +519,14 @@ pub fn palenight() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x697098ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
@@ -578,7 +602,7 @@ pub fn palenight() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0xc792eaff).into()),
color: Some(rgba(0x89ddffff).into()),
..Default::default()
},
),
@@ -620,7 +644,7 @@ pub fn palenight() -> UserThemeFamily {
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xffcb6bff).into()),
color: Some(rgba(0xff5572ff).into()),
..Default::default()
},
),
crates/theme2/src/themes/rose_pine.rs
+33 -15
View File
@@ -91,11 +91,18 @@ pub fn rose_pine() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x6e6a86ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xeb6f92ff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0xe0def4ff).into()),
..Default::default()
},
),
@@ -123,7 +130,7 @@ pub fn rose_pine() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x908caaff).into()),
color: Some(rgba(0x6e6a86ff).into()),
..Default::default()
},
),
@@ -165,8 +172,7 @@ pub fn rose_pine() -> UserThemeFamily {
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xebbcbaff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0xc4a7e7ff).into()),
..Default::default()
},
),
@@ -258,11 +264,18 @@ pub fn rose_pine() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x6e6a86ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xeb6f92ff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0xe0def4ff).into()),
..Default::default()
},
),
@@ -290,7 +303,7 @@ pub fn rose_pine() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x908caaff).into()),
color: Some(rgba(0x6e6a86ff).into()),
..Default::default()
},
),
@@ -332,8 +345,7 @@ pub fn rose_pine() -> UserThemeFamily {
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xea9a97ff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0xc4a7e7ff).into()),
..Default::default()
},
),
@@ -425,11 +437,18 @@ pub fn rose_pine() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x9893a5ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0xb4637aff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0x575279ff).into()),
..Default::default()
},
),
@@ -457,7 +476,7 @@ pub fn rose_pine() -> UserThemeFamily {
(
"punctuation".into(),
UserHighlightStyle {
color: Some(rgba(0x797593ff).into()),
color: Some(rgba(0x9893a5ff).into()),
..Default::default()
},
),
@@ -499,8 +518,7 @@ pub fn rose_pine() -> UserThemeFamily {
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xd7827eff).into()),
font_style: Some(UserFontStyle::Italic),
color: Some(rgba(0x907aa9ff).into()),
..Default::default()
},
),
crates/theme2/src/themes/solarized.rs
+23 -7
View File
@@ -86,6 +86,14 @@ pub fn solarized() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x657b83ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
@@ -117,14 +125,14 @@ pub fn solarized() -> UserThemeFamily {
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x268bd2ff).into()),
color: Some(rgba(0x839496ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x859900ff).into()),
color: Some(rgba(0x268bd2ff).into()),
..Default::default()
},
),
@@ -180,14 +188,14 @@ pub fn solarized() -> UserThemeFamily {
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0xcb4b16ff).into()),
color: Some(rgba(0x859900ff).into()),
..Default::default()
},
),
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0x268bd2ff).into()),
color: Some(rgba(0x839496ff).into()),
..Default::default()
},
),
@@ -271,6 +279,14 @@ pub fn solarized() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x93a1a1ff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"constant".into(),
UserHighlightStyle {
@@ -302,14 +318,14 @@ pub fn solarized() -> UserThemeFamily {
(
"function".into(),
UserHighlightStyle {
color: Some(rgba(0x268bd2ff).into()),
color: Some(rgba(0x657b83ff).into()),
..Default::default()
},
),
(
"keyword".into(),
UserHighlightStyle {
color: Some(rgba(0x859900ff).into()),
color: Some(rgba(0x268bd2ff).into()),
..Default::default()
},
),
@@ -358,7 +374,7 @@ pub fn solarized() -> UserThemeFamily {
(
"type".into(),
UserHighlightStyle {
color: Some(rgba(0x268bd2ff).into()),
color: Some(rgba(0x859900ff).into()),
..Default::default()
},
),
crates/theme2/src/themes/synthwave_84.rs
+10 -1
View File
@@ -75,6 +75,14 @@ pub fn synthwave_84() -> UserThemeFamily {
..Default::default()
},
),
(
"comment.doc".into(),
UserHighlightStyle {
color: Some(rgba(0x848bbdff).into()),
font_style: Some(UserFontStyle::Italic),
..Default::default()
},
),
(
"function".into(),
UserHighlightStyle {
@@ -162,7 +170,8 @@ pub fn synthwave_84() -> UserThemeFamily {
(
"variable".into(),
UserHighlightStyle {
color: Some(rgba(0xff7edbff).into()),
color: Some(rgba(0xfe4450ff).into()),
font_weight: Some(UserFontWeight(700.0)),
..Default::default()
},
),