Adjust which status colors we import from the VS Code theme (#3570)

This PR adjusts the status colors we import from the VS Code theme to be
the right ones.

Instead of looking at the Git status colors, we use the
`editorGutter.addedBackground`, `editorGutter.modifiedBackground`, and
`editorGutter.deletedBackground` colors for added, modified, and deleted
status colors, respectively.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2023-12-08 17:56:25 -05:00 committed by GitHub
parent cf42d95af6
commit 008c56a09b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 78 additions and 73 deletions

View file

@ -75,16 +75,20 @@ impl VsCodeThemeConverter {
};
Ok(StatusColorsRefinement {
conflict: vscode_colors
.git_decoration_conflicting_resource_foreground
created: vscode_colors
.editor_gutter_added_background
.as_ref()
.traverse(|color| try_parse_color(&color))?,
created: vscode_colors
.git_decoration_untracked_resource_foreground
modified: vscode_colors
.editor_gutter_modified_background
.as_ref()
.traverse(|color| try_parse_color(&color))?,
deleted: vscode_colors
.error_foreground
.editor_gutter_deleted_background
.as_ref()
.traverse(|color| try_parse_color(&color))?,
conflict: vscode_colors
.git_decoration_conflicting_resource_foreground
.as_ref()
.traverse(|color| try_parse_color(&color))?,
error: vscode_colors
@ -105,10 +109,6 @@ impl VsCodeThemeConverter {
.as_ref()
.traverse(|color| try_parse_color(&color))?,
// info: None,
modified: vscode_colors
.git_decoration_modified_resource_foreground
.as_ref()
.traverse(|color| try_parse_color(&color))?,
// renamed: None,
// success: None,
warning: vscode_colors