Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

git: Use version control colors in diff hunk line numbers (#59973)

Dinoadedf355d520
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 897200cdea5..81ef8b6a9d8 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -103,6 +103,40 @@ struct LineHighlightSpec {
_active_stack_frame: bool,
}
+enum LineNumberStyle {
+ Breakpoint,
+ DiffAdded,
+ DiffDeleted,
+ Active,
+ Inactive,
+}
+
+impl LineNumberStyle {
+ fn new(is_active: bool, is_breakpoint: bool, diff_status: Option<DiffHunkStatus>) -> Self {
+ match (
+ is_active,
+ is_breakpoint,
+ diff_status.map(|status| status.kind),
+ ) {
+ (_, true, _) => Self::Breakpoint,
+ (true, _, _) => Self::Active,
+ (_, _, Some(DiffHunkStatusKind::Added)) => Self::DiffAdded,
+ (_, _, Some(DiffHunkStatusKind::Deleted)) => Self::DiffDeleted,
+ (_, _, _) => Self::Inactive,
+ }
+ }
+
+ fn color(self, colors: &theme::ThemeColors) -> Hsla {
+ match self {
+ Self::Breakpoint => colors.debugger_accent,
+ Self::DiffAdded => colors.version_control_added,
+ Self::DiffDeleted => colors.version_control_deleted,
+ Self::Active => colors.editor_active_line_number,
+ Self::Inactive => colors.editor_line_number,
+ }
+ }
+}
+
#[derive(Debug)]
struct SelectionLayout {
head: DisplayPoint,
@@ -2725,16 +2759,14 @@ impl EditorElement {
let number = relative_number.unwrap_or(&non_relative_number);
write!(&mut line_number, "{number}").unwrap();
- let color = active_rows
- .get(&display_row)
- .map(|spec| {
- if spec.breakpoint {
- cx.theme().colors().debugger_accent
- } else {
- cx.theme().colors().editor_active_line_number
- }
- })
- .unwrap_or_else(|| cx.theme().colors().editor_line_number);
+ let spec = active_rows.get(&display_row);
+ let color = LineNumberStyle::new(
+ spec.is_some(),
+ spec.is_some_and(|spec| spec.breakpoint),
+ row_info.diff_status,
+ )
+ .color(cx.theme().colors());
+
let shaped_line =
self.shape_line_number(SharedString::from(&line_number), color, window);
let scroll_top =