Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add more terminal colors to the theme (#4168)

Browse source 
This PR adds more terminal colors that were present in the Zed1 themes
to the Zed2 theme.

Namely, we now have the `dim_` variants for the various ANSI colors and
various `foreground` colors.

Release Notes:

- Improved terminal colors.
This commit is contained in:
Marshall Bowers 2024-01-19 14:22:53 -05:00 • committed by GitHub
parent 1cc7f66f86
commit df2b0f6d2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 926 additions and 419 deletions
Download patch file Download diff file Expand all files Collapse all files

33
crates/theme_importer/src/theme_printer.rs
View file

@ -244,43 +244,60 @@ impl<'a> Debug for ThemeColorsRefinementPrinter<'a> {
self.0.editor_document_highlight_write_background,
),
("terminal_background", self.0.terminal_background),
("terminal_foreground", self.0.terminal_foreground),
(
"terminal_bright_foreground",
self.0.terminal_bright_foreground,
),
("terminal_dim_foreground", self.0.terminal_dim_foreground),
("terminal_ansi_black", self.0.terminal_ansi_black),
(
"terminal_ansi_bright_black",
self.0.terminal_ansi_bright_black,
),
("terminal_ansi_dim_black", self.0.terminal_ansi_dim_black),
("terminal_ansi_red", self.0.terminal_ansi_red),
("terminal_ansi_bright_red", self.0.terminal_ansi_bright_red),
("terminal_ansi_dim_red", self.0.terminal_ansi_dim_red),
("terminal_ansi_green", self.0.terminal_ansi_green),
(
"terminal_ansi_bright_green",
self.0.terminal_ansi_bright_green,
),
("terminal_ansi_dim_green", self.0.terminal_ansi_dim_green),
("terminal_ansi_yellow", self.0.terminal_ansi_yellow),
(
"terminal_ansi_bright_yellow",
self.0.terminal_ansi_bright_yellow,
),
("terminal_ansi_dim_yellow", self.0.terminal_ansi_dim_yellow),
("terminal_ansi_blue", self.0.terminal_ansi_blue),
(
"terminal_ansi_bright_blue",
self.0.terminal_ansi_bright_blue,
),
("terminal_ansi_dim_blue", self.0.terminal_ansi_dim_blue),
("terminal_ansi_magenta", self.0.terminal_ansi_magenta),
(
"terminal_ansi_bright_magenta",
self.0.terminal_ansi_bright_magenta,
),
(
"terminal_ansi_dim_magenta",
self.0.terminal_ansi_dim_magenta,
),
("terminal_ansi_cyan", self.0.terminal_ansi_cyan),
(
"terminal_ansi_bright_cyan",
self.0.terminal_ansi_bright_cyan,
),
("terminal_ansi_dim_cyan", self.0.terminal_ansi_dim_cyan),
("terminal_ansi_white", self.0.terminal_ansi_white),
(
"terminal_ansi_bright_white",
self.0.terminal_ansi_bright_white,
),
("terminal_ansi_black", self.0.terminal_ansi_black),
("terminal_ansi_red", self.0.terminal_ansi_red),
("terminal_ansi_green", self.0.terminal_ansi_green),
("terminal_ansi_yellow", self.0.terminal_ansi_yellow),
("terminal_ansi_blue", self.0.terminal_ansi_blue),
("terminal_ansi_magenta", self.0.terminal_ansi_magenta),
("terminal_ansi_cyan", self.0.terminal_ansi_cyan),
("terminal_ansi_white", self.0.terminal_ansi_white),
("terminal_ansi_dim_white", self.0.terminal_ansi_dim_white),
("link_text_hover", self.0.link_text_hover),
];

27
crates/theme_importer/src/zed1/converter.rs
View file

@ -250,22 +250,33 @@ impl Zed1ThemeConverter {
editor.document_highlight_write_background,
),
terminal_background: convert(terminal.background),
terminal_ansi_bright_black: convert(terminal.bright_black),
terminal_ansi_bright_red: convert(terminal.bright_red),
terminal_ansi_bright_green: convert(terminal.bright_green),
terminal_ansi_bright_yellow: convert(terminal.bright_yellow),
terminal_ansi_bright_blue: convert(terminal.bright_blue),
terminal_ansi_bright_magenta: convert(terminal.bright_magenta),
terminal_ansi_bright_cyan: convert(terminal.bright_cyan),
terminal_ansi_bright_white: convert(terminal.bright_white),
terminal_foreground: convert(terminal.foreground),
terminal_bright_foreground: convert(terminal.bright_foreground),
terminal_dim_foreground: convert(terminal.dim_foreground),
terminal_ansi_black: convert(terminal.black),
terminal_ansi_bright_black: convert(terminal.bright_black),
terminal_ansi_dim_black: convert(terminal.dim_black),
terminal_ansi_red: convert(terminal.red),
terminal_ansi_bright_red: convert(terminal.bright_red),
terminal_ansi_dim_red: convert(terminal.dim_red),
terminal_ansi_green: convert(terminal.green),
terminal_ansi_bright_green: convert(terminal.bright_green),
terminal_ansi_dim_green: convert(terminal.dim_green),
terminal_ansi_yellow: convert(terminal.yellow),
terminal_ansi_bright_yellow: convert(terminal.bright_yellow),
terminal_ansi_dim_yellow: convert(terminal.dim_yellow),
terminal_ansi_blue: convert(terminal.blue),
terminal_ansi_bright_blue: convert(terminal.bright_blue),
terminal_ansi_dim_blue: convert(terminal.dim_blue),
terminal_ansi_magenta: convert(terminal.magenta),
terminal_ansi_bright_magenta: convert(terminal.bright_magenta),
terminal_ansi_dim_magenta: convert(terminal.dim_magenta),
terminal_ansi_cyan: convert(terminal.cyan),
terminal_ansi_bright_cyan: convert(terminal.bright_cyan),
terminal_ansi_dim_cyan: convert(terminal.dim_cyan),
terminal_ansi_white: convert(terminal.white),
terminal_ansi_bright_white: convert(terminal.bright_white),
terminal_ansi_dim_white: convert(terminal.dim_white),
link_text_hover: convert(highest.accent.default.foreground),
})
}