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

Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-09 14:53:04 -05:00
parent 54157eb99a
commit 1c6a960bbf
2 changed files with 13 additions and 1 deletions
@@ -157,7 +157,17 @@ impl VsCodeThemeConverter {
            text: vscode_colors
                .foreground
                .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
                .as_ref()