zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 18:41:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pull Git status colors from VS Code themes

Browse Source
This commit is contained in:
Marshall Bowers 2023-12-08 13:14:22 -05:00
parent a5a0ad8b5c
commit ab5b76e943
11 changed files with 134 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/theme2/src/themes/andromeda.rs
View File

@ -63,6 +63,7 @@ pub fn andromeda() -> UserThemeFamily {
error: Some(rgba(0xfc644dff).into()),
hidden: Some(rgba(0x746f77ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x555555ff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -267,6 +268,7 @@ pub fn andromeda() -> UserThemeFamily {
error: Some(rgba(0xfc644dff).into()),
hidden: Some(rgba(0x746f77ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x555555ff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {

9
crates/theme2/src/themes/ayu.rs
View File

@ -63,10 +63,13 @@ pub fn ayu() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
created: Some(rgba(0x6cbf43b3).into()),
deleted: Some(rgba(0xe65050ff).into()),
error: Some(rgba(0xe65050ff).into()),
hidden: Some(rgba(0x8a9199ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x8a919980).into()),
modified: Some(rgba(0x478accb3).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -359,10 +362,13 @@ pub fn ayu() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
created: Some(rgba(0x87d96cb3).into()),
deleted: Some(rgba(0xff6666ff).into()),
error: Some(rgba(0xff6666ff).into()),
hidden: Some(rgba(0x707a8cff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x707a8c80).into()),
modified: Some(rgba(0x80bfffb3).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -655,10 +661,13 @@ pub fn ayu() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
created: Some(rgba(0x7fd962b3).into()),
deleted: Some(rgba(0xd95757ff).into()),
error: Some(rgba(0xd95757ff).into()),
hidden: Some(rgba(0x565b66ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x565b6680).into()),
modified: Some(rgba(0x73b8ffb3).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {

4
crates/theme2/src/themes/dracula.rs
View File

@ -63,10 +63,14 @@ pub fn dracula() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xffb86cff).into()),
created: Some(rgba(0x50fa7bff).into()),
deleted: Some(rgba(0xff5555ff).into()),
error: Some(rgba(0xff5555ff).into()),
hidden: Some(rgba(0x6272a4ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x6272a4ff).into()),
modified: Some(rgba(0x8be9fdff).into()),
warning: Some(rgba(0xffb86cff).into()),
..Default::default()
},

24
crates/theme2/src/themes/gruvbox.rs
View File

@ -60,10 +60,14 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xb16286ff).into()),
created: Some(rgba(0x98971aff).into()),
deleted: Some(rgba(0xfb4934ff).into()),
error: Some(rgba(0xfb4934ff).into()),
hidden: Some(rgba(0xa89984ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x7c6f64ff).into()),
modified: Some(rgba(0xd79921ff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -331,10 +335,14 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xb16286ff).into()),
created: Some(rgba(0x98971aff).into()),
deleted: Some(rgba(0xfb4934ff).into()),
error: Some(rgba(0xfb4934ff).into()),
hidden: Some(rgba(0xa89984ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x7c6f64ff).into()),
modified: Some(rgba(0xd79921ff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -602,10 +610,14 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xb16286ff).into()),
created: Some(rgba(0x98971aff).into()),
deleted: Some(rgba(0xfb4934ff).into()),
error: Some(rgba(0xfb4934ff).into()),
hidden: Some(rgba(0xa89984ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x7c6f64ff).into()),
modified: Some(rgba(0xd79921ff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -873,10 +885,14 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xb16286ff).into()),
created: Some(rgba(0x98971aff).into()),
deleted: Some(rgba(0x9d0006ff).into()),
error: Some(rgba(0x9d0006ff).into()),
hidden: Some(rgba(0x7c6f64ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0xa89984ff).into()),
modified: Some(rgba(0xd79921ff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -1144,10 +1160,14 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xb16286ff).into()),
created: Some(rgba(0x98971aff).into()),
deleted: Some(rgba(0x9d0006ff).into()),
error: Some(rgba(0x9d0006ff).into()),
hidden: Some(rgba(0x7c6f64ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0xa89984ff).into()),
modified: Some(rgba(0xd79921ff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -1415,10 +1435,14 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xb16286ff).into()),
created: Some(rgba(0x98971aff).into()),
deleted: Some(rgba(0x9d0006ff).into()),
error: Some(rgba(0x9d0006ff).into()),
hidden: Some(rgba(0x7c6f64ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0xa89984ff).into()),
modified: Some(rgba(0xd79921ff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {

4
crates/theme2/src/themes/night_owl.rs
View File

@ -63,10 +63,14 @@ pub fn night_owl() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xffeb95cc).into()),
created: Some(rgba(0xc5e478ff).into()),
deleted: Some(rgba(0xef5350ff).into()),
error: Some(rgba(0xef5350ff).into()),
hidden: Some(rgba(0x5f7e97ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x395a75ff).into()),
modified: Some(rgba(0xa2bffcff).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {

44
crates/theme2/src/themes/noctis.rs
View File

@ -64,10 +64,14 @@ pub fn noctis() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xffc180ff).into()),
created: Some(rgba(0x40d4e7ff).into()),
deleted: Some(rgba(0xe34e1cff).into()),
error: Some(rgba(0xe34e1cff).into()),
hidden: Some(rgba(0x9fb6c6ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x5b788bff).into()),
modified: Some(rgba(0x49e9a6ff).into()),
warning: Some(rgba(0xffa857ff).into()),
..Default::default()
},
@ -330,10 +334,14 @@ pub fn noctis() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xffc180ff).into()),
created: Some(rgba(0x40d4e7ff).into()),
deleted: Some(rgba(0xe34e1cff).into()),
error: Some(rgba(0xe34e1cff).into()),
hidden: Some(rgba(0xbbaab0ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x5b788bff).into()),
modified: Some(rgba(0x49e9a6ff).into()),
warning: Some(rgba(0xffa857ff).into()),
..Default::default()
},
@ -596,10 +604,14 @@ pub fn noctis() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xe9a149ff).into()),
created: Some(rgba(0x00c6e0ff).into()),
deleted: Some(rgba(0xff4000ff).into()),
error: Some(rgba(0xff4000ff).into()),
hidden: Some(rgba(0x71838eff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0xa8a28faa).into()),
modified: Some(rgba(0x14b832ff).into()),
warning: Some(rgba(0xe07a52ff).into()),
..Default::default()
},
@ -862,10 +874,14 @@ pub fn noctis() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xe9a149ff).into()),
created: Some(rgba(0x00c6e0ff).into()),
deleted: Some(rgba(0xff4000ff).into()),
error: Some(rgba(0xff4000ff).into()),
hidden: Some(rgba(0x75718eff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0xa8a28faa).into()),
modified: Some(rgba(0x14b832ff).into()),
warning: Some(rgba(0xe07a52ff).into()),
..Default::default()
},
@ -1128,10 +1144,14 @@ pub fn noctis() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xe9a149ff).into()),
created: Some(rgba(0x00c6e0ff).into()),
deleted: Some(rgba(0xff4000ff).into()),
error: Some(rgba(0xff4000ff).into()),
hidden: Some(rgba(0x888477ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0xa8a28faa).into()),
modified: Some(rgba(0x14b832ff).into()),
warning: Some(rgba(0xe07a52ff).into()),
..Default::default()
},
@ -1394,10 +1414,14 @@ pub fn noctis() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xdfc09fff).into()),
created: Some(rgba(0x6fb0b8ff).into()),
deleted: Some(rgba(0xb96346ff).into()),
error: Some(rgba(0xb96346ff).into()),
hidden: Some(rgba(0x96a8b6ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x5b788bff).into()),
modified: Some(rgba(0x72c09fff).into()),
warning: Some(rgba(0xffa857ff).into()),
..Default::default()
},
@ -1660,10 +1684,14 @@ pub fn noctis() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xe4b781ff).into()),
created: Some(rgba(0x40d4e7ff).into()),
deleted: Some(rgba(0xe34e1cff).into()),
error: Some(rgba(0xe34e1cff).into()),
hidden: Some(rgba(0x87a7abff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x5b858bff).into()),
modified: Some(rgba(0x49e9a6ff).into()),
warning: Some(rgba(0xffa487ff).into()),
..Default::default()
},
@ -1926,10 +1954,14 @@ pub fn noctis() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xe4b781ff).into()),
created: Some(rgba(0x40d4e7ff).into()),
deleted: Some(rgba(0xe34e1cff).into()),
error: Some(rgba(0xe34e1cff).into()),
hidden: Some(rgba(0x87a7abff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x647e82ff).into()),
modified: Some(rgba(0x49e9a6ff).into()),
warning: Some(rgba(0xffa487ff).into()),
..Default::default()
},
@ -2192,10 +2224,14 @@ pub fn noctis() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xe4b781ff).into()),
created: Some(rgba(0x40d4e7ff).into()),
deleted: Some(rgba(0xe34e1cff).into()),
error: Some(rgba(0xe34e1cff).into()),
hidden: Some(rgba(0x87a7abff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x647e82ff).into()),
modified: Some(rgba(0x49e9a6ff).into()),
warning: Some(rgba(0xffa487ff).into()),
..Default::default()
},
@ -2458,10 +2494,14 @@ pub fn noctis() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xffc180ff).into()),
created: Some(rgba(0x40d4e7ff).into()),
deleted: Some(rgba(0xe34e1cff).into()),
error: Some(rgba(0xe34e1cff).into()),
hidden: Some(rgba(0xa9a5c0ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x5b788bff).into()),
modified: Some(rgba(0x49e9a6ff).into()),
warning: Some(rgba(0xffa857ff).into()),
..Default::default()
},
@ -2724,10 +2764,14 @@ pub fn noctis() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xffc180ff).into()),
created: Some(rgba(0x40d4e7ff).into()),
deleted: Some(rgba(0xe34e1cff).into()),
error: Some(rgba(0xe34e1cff).into()),
hidden: Some(rgba(0xb3a5c0ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x5b788bff).into()),
modified: Some(rgba(0x49e9a6ff).into()),
warning: Some(rgba(0xffa857ff).into()),
..Default::default()
},

4
crates/theme2/src/themes/nord.rs
View File

@ -63,10 +63,14 @@ pub fn nord() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0x5e81acff).into()),
created: Some(rgba(0xa3be8cff).into()),
deleted: Some(rgba(0xbf616aff).into()),
error: Some(rgba(0xbf616aff).into()),
hidden: Some(rgba(0xd8dee966).into()),
hint: Some(rgba(0xd8dee9ff).into()),
ignored: Some(rgba(0xd8dee966).into()),
modified: Some(rgba(0xebcb8bff).into()),
warning: Some(rgba(0xebcb8bff).into()),
..Default::default()
},

12
crates/theme2/src/themes/palenight.rs
View File

@ -63,10 +63,14 @@ pub fn palenight() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xffeb95cc).into()),
created: Some(rgba(0xa9c77dff).into()),
deleted: Some(rgba(0xef5350ff).into()),
error: Some(rgba(0xef5350ff).into()),
hidden: Some(rgba(0x929ac9ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x69709890).into()),
modified: Some(rgba(0xe2c08de6).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -338,10 +342,14 @@ pub fn palenight() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xffeb95cc).into()),
created: Some(rgba(0xa9c77dff).into()),
deleted: Some(rgba(0xef5350ff).into()),
error: Some(rgba(0xef5350ff).into()),
hidden: Some(rgba(0x929ac9ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x69709890).into()),
modified: Some(rgba(0xe2c08de6).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {
@ -613,10 +621,14 @@ pub fn palenight() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xffeb95cc).into()),
created: Some(rgba(0xa9c77dff).into()),
deleted: Some(rgba(0xef5350ff).into()),
error: Some(rgba(0xef5350ff).into()),
hidden: Some(rgba(0x929ac9ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0x69709890).into()),
modified: Some(rgba(0xe2c08de6).into()),
..Default::default()
},
syntax: Some(UserSyntaxTheme {

12
crates/theme2/src/themes/rose_pine.rs
View File

@ -63,10 +63,14 @@ pub fn rose_pine() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xeb6f92ff).into()),
created: Some(rgba(0xf6c177ff).into()),
deleted: Some(rgba(0xeb6f92ff).into()),
error: Some(rgba(0xeb6f92ff).into()),
hidden: Some(rgba(0x908caaff).into()),
hint: Some(rgba(0x908caaff).into()),
ignored: Some(rgba(0x6e6a86ff).into()),
modified: Some(rgba(0xebbcbaff).into()),
warning: Some(rgba(0xf6c177ff).into()),
..Default::default()
},
@ -310,10 +314,14 @@ pub fn rose_pine() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xeb6f92ff).into()),
created: Some(rgba(0xf6c177ff).into()),
deleted: Some(rgba(0xeb6f92ff).into()),
error: Some(rgba(0xeb6f92ff).into()),
hidden: Some(rgba(0x908caaff).into()),
hint: Some(rgba(0x908caaff).into()),
ignored: Some(rgba(0x6e6a86ff).into()),
modified: Some(rgba(0xea9a97ff).into()),
warning: Some(rgba(0xf6c177ff).into()),
..Default::default()
},
@ -557,10 +565,14 @@ pub fn rose_pine() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
conflict: Some(rgba(0xb4637aff).into()),
created: Some(rgba(0xea9d34ff).into()),
deleted: Some(rgba(0xb4637aff).into()),
error: Some(rgba(0xb4637aff).into()),
hidden: Some(rgba(0x797593ff).into()),
hint: Some(rgba(0x797593ff).into()),
ignored: Some(rgba(0x9893a5ff).into()),
modified: Some(rgba(0xd7827eff).into()),
warning: Some(rgba(0xea9d34ff).into()),
..Default::default()
},

3
crates/theme2/src/themes/synthwave_84.rs
View File

@ -47,9 +47,12 @@ pub fn synthwave_84() -> UserThemeFamily {
..Default::default()
},
status: StatusColorsRefinement {
created: Some(rgba(0x72f1b8ff).into()),
deleted: Some(rgba(0xfe4450ff).into()),
error: Some(rgba(0xfe4450ff).into()),
hint: Some(rgba(0x969696ff).into()),
ignored: Some(rgba(0xffffff59).into()),
modified: Some(rgba(0xb893ceee).into()),
warning: Some(rgba(0x72f1b8bb).into()),
..Default::default()
},

20
crates/theme_importer/src/vscode/converter.rs
View File

@ -75,8 +75,14 @@ impl VsCodeThemeConverter {
};
Ok(StatusColorsRefinement {
// conflict: None,
// created: None,
conflict: vscode_colors
.git_decoration_conflicting_resource_foreground
.as_ref()
.traverse(|color| try_parse_color(&color))?,
created: vscode_colors
.git_decoration_untracked_resource_foreground
.as_ref()
.traverse(|color| try_parse_color(&color))?,
deleted: vscode_colors
.error_foreground
.as_ref()
@ -94,9 +100,15 @@ impl VsCodeThemeConverter {
.as_ref()
.traverse(|color| try_parse_color(&color))?
.or(vscode_base_status_colors.hint),
// ignored: None,
ignored: vscode_colors
.git_decoration_ignored_resource_foreground
.as_ref()
.traverse(|color| try_parse_color(&color))?,
// info: None,
// modified: None,
modified: vscode_colors
.git_decoration_modified_resource_foreground
.as_ref()
.traverse(|color| try_parse_color(&color))?,
// renamed: None,
// success: None,
warning: vscode_colors