Add new `ThemeColors` values to the theme printer

Marshall Bowers created 2 years ago

Change summary

crates/theme2/src/registry.rs              |  8 ++---
crates/theme_importer/src/theme_printer.rs | 34 ++++++++++++++++++++++-
2 files changed, 35 insertions(+), 7 deletions(-)

Detailed changes

crates/theme2/src/registry.rs

@@ -1,4 +1,4 @@
-use crate::{all_imported_themes, zed_pro_family, ThemeFamily, ThemeVariant};
+use crate::{zed_pro_family, ThemeFamily, ThemeVariant};
 use anyhow::{anyhow, Result};
 use gpui::SharedString;
 use std::{collections::HashMap, sync::Arc};
@@ -42,10 +42,8 @@ impl Default for ThemeRegistry {
             themes: HashMap::default(),
         };
 
-        let mut all_themes = vec![zed_pro_family()];
-        all_themes.extend(all_imported_themes());
-
-        this.insert_theme_families(all_themes);
+        this.insert_theme_families([zed_pro_family()]);
+        this.insert_theme_families(crate::all_imported_themes());
 
         this
     }

crates/theme_importer/src/theme_printer.rs

@@ -134,12 +134,12 @@ impl<'a> Debug for ThemeColorsPrinter<'a> {
             .field("border", &HslaPrinter(self.0.border))
             .field("border_variant", &HslaPrinter(self.0.border_variant))
             .field("border_focused", &HslaPrinter(self.0.border_focused))
-            .field("border_disabled", &HslaPrinter(self.0.border_disabled))
             .field("border_selected", &HslaPrinter(self.0.border_selected))
             .field(
                 "border_transparent",
                 &HslaPrinter(self.0.border_transparent),
             )
+            .field("border_disabled", &HslaPrinter(self.0.border_disabled))
             .field(
                 "elevated_surface_background",
                 &HslaPrinter(self.0.elevated_surface_background),
@@ -220,14 +220,44 @@ impl<'a> Debug for ThemeColorsPrinter<'a> {
                 &HslaPrinter(self.0.tab_active_background),
             )
             .field("editor_background", &HslaPrinter(self.0.editor_background))
+            .field(
+                "editor_gutter_background",
+                &HslaPrinter(self.0.editor_gutter_background),
+            )
             .field(
                 "editor_subheader_background",
                 &HslaPrinter(self.0.editor_subheader_background),
             )
             .field(
-                "editor_active_line",
+                "editor_active_line_background",
                 &HslaPrinter(self.0.editor_active_line_background),
             )
+            .field(
+                "editor_highlighted_line_background",
+                &HslaPrinter(self.0.editor_highlighted_line_background),
+            )
+            .field(
+                "editor_line_number",
+                &HslaPrinter(self.0.editor_line_number),
+            )
+            .field(
+                "editor_active_line_number",
+                &HslaPrinter(self.0.editor_active_line_number),
+            )
+            .field("editor_invisible", &HslaPrinter(self.0.editor_invisible))
+            .field("editor_wrap_guide", &HslaPrinter(self.0.editor_wrap_guide))
+            .field(
+                "editor_active_wrap_guide",
+                &HslaPrinter(self.0.editor_active_wrap_guide),
+            )
+            .field(
+                "editor_document_highlight_read_background",
+                &HslaPrinter(self.0.editor_document_highlight_read_background),
+            )
+            .field(
+                "editor_document_highlight_write_background",
+                &HslaPrinter(self.0.editor_document_highlight_write_background),
+            )
             .field(
                 "terminal_background",
                 &HslaPrinter(self.0.terminal_background),