Use `editor.foreground` from VS Code for the editor foreground

Marshall Bowers created 2 years ago

Change summary

crates/theme2/src/themes/ayu.rs               |  6 +++---
crates/theme2/src/themes/palenight.rs         |  6 +++---
crates/theme2/src/themes/synthwave_84.rs      |  1 -
crates/theme_importer/src/vscode/converter.rs | 11 ++++++-----
4 files changed, 12 insertions(+), 12 deletions(-)

Detailed changes

crates/theme2/src/themes/ayu.rs

@@ -46,7 +46,7 @@ pub fn ayu() -> UserThemeFamily {
                         scrollbar_thumb_border: Some(rgba(0x8a919966).into()),
                         scrollbar_track_background: Some(rgba(0xf8f9faff).into()),
                         scrollbar_track_border: Some(rgba(0x6b7d8f1f).into()),
-                        editor_foreground: Some(rgba(0x8a9199ff).into()),
+                        editor_foreground: Some(rgba(0x5c6166ff).into()),
                         editor_background: Some(rgba(0xf8f9faff).into()),
                         editor_gutter_background: Some(rgba(0xf8f9faff).into()),
                         editor_line_number: Some(rgba(0x8a919966).into()),
@@ -353,7 +353,7 @@ pub fn ayu() -> UserThemeFamily {
                         scrollbar_thumb_border: Some(rgba(0x707a8c66).into()),
                         scrollbar_track_background: Some(rgba(0x1f2430ff).into()),
                         scrollbar_track_border: Some(rgba(0x171b24ff).into()),
-                        editor_foreground: Some(rgba(0x707a8cff).into()),
+                        editor_foreground: Some(rgba(0xcccac2ff).into()),
                         editor_background: Some(rgba(0x1f2430ff).into()),
                         editor_gutter_background: Some(rgba(0x1f2430ff).into()),
                         editor_line_number: Some(rgba(0x8a919966).into()),
@@ -660,7 +660,7 @@ pub fn ayu() -> UserThemeFamily {
                         scrollbar_thumb_border: Some(rgba(0x565b6666).into()),
                         scrollbar_track_background: Some(rgba(0x0b0e14ff).into()),
                         scrollbar_track_border: Some(rgba(0x1e232bff).into()),
-                        editor_foreground: Some(rgba(0x565b66ff).into()),
+                        editor_foreground: Some(rgba(0xbfbdb6ff).into()),
                         editor_background: Some(rgba(0x0b0e14ff).into()),
                         editor_gutter_background: Some(rgba(0x0b0e14ff).into()),
                         editor_line_number: Some(rgba(0x6c738099).into()),

crates/theme2/src/themes/palenight.rs

@@ -46,7 +46,7 @@ pub fn palenight() -> UserThemeFamily {
                         scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()),
                         scrollbar_thumb_border: Some(rgba(0x694ca466).into()),
                         scrollbar_track_background: Some(rgba(0x292d3eff).into()),
-                        editor_foreground: Some(rgba(0xffffffff).into()),
+                        editor_foreground: Some(rgba(0xbfc7d5ff).into()),
                         editor_background: Some(rgba(0x292d3eff).into()),
                         editor_gutter_background: Some(rgba(0x292d3eff).into()),
                         editor_line_number: Some(rgba(0x4c5374ff).into()),
@@ -332,7 +332,7 @@ pub fn palenight() -> UserThemeFamily {
                         scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()),
                         scrollbar_thumb_border: Some(rgba(0x694ca466).into()),
                         scrollbar_track_background: Some(rgba(0x292d3eff).into()),
-                        editor_foreground: Some(rgba(0xffffffff).into()),
+                        editor_foreground: Some(rgba(0xbfc7d5ff).into()),
                         editor_background: Some(rgba(0x292d3eff).into()),
                         editor_gutter_background: Some(rgba(0x292d3eff).into()),
                         editor_line_number: Some(rgba(0x4c5374ff).into()),
@@ -618,7 +618,7 @@ pub fn palenight() -> UserThemeFamily {
                         scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()),
                         scrollbar_thumb_border: Some(rgba(0x694ca466).into()),
                         scrollbar_track_background: Some(rgba(0x292d3eff).into()),
-                        editor_foreground: Some(rgba(0xffffffff).into()),
+                        editor_foreground: Some(rgba(0xbfc7d5ff).into()),
                         editor_background: Some(rgba(0x292d3eff).into()),
                         editor_gutter_background: Some(rgba(0x292d3eff).into()),
                         editor_line_number: Some(rgba(0x4c5374ff).into()),

crates/theme2/src/themes/synthwave_84.rs

@@ -39,7 +39,6 @@ pub fn synthwave_84() -> UserThemeFamily {
                     scrollbar_thumb_border: Some(rgba(0x9d8bca30).into()),
                     scrollbar_track_background: Some(rgba(0x262335ff).into()),
                     scrollbar_track_border: Some(rgba(0x34294fb3).into()),
-                    editor_foreground: Some(rgba(0xffffffff).into()),
                     editor_background: Some(rgba(0x262335ff).into()),
                     editor_gutter_background: Some(rgba(0x262335ff).into()),
                     editor_line_number: Some(rgba(0xffffff73).into()),

crates/theme_importer/src/vscode/converter.rs

@@ -132,6 +132,11 @@ impl VsCodeThemeConverter {
             .as_ref()
             .traverse(|color| try_parse_color(&color))?;
 
+        let vscode_editor_foreground = vscode_colors
+            .editor_foreground
+            .as_ref()
+            .traverse(|color| try_parse_color(&color))?;
+
         let vscode_editor_background = vscode_colors
             .editor_background
             .as_ref()
@@ -227,11 +232,7 @@ impl VsCodeThemeConverter {
                 .as_ref()
                 .traverse(|color| try_parse_color(&color))?
                 .or(vscode_editor_background),
-            editor_foreground: vscode_colors
-                .foreground
-                .as_ref()
-                .traverse(|color| try_parse_color(&color))?
-                .or(vscode_token_colors_foreground),
+            editor_foreground: vscode_editor_foreground.or(vscode_token_colors_foreground),
             editor_background: vscode_editor_background,
             editor_gutter_background: vscode_editor_background,
             editor_line_number: vscode_colors