vrr/zed
2
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-07-10 00:13:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

editor: Refresh active debug line highlight on theme change (#59274)

Browse source 
# Objective

Fixes #58736

Pause the debugger on a breakpoint, switch your theme, and the active
debug line keeps its old highlight color until you step again or restart
Zed.

## Solution

The highlight stores a concrete color grabbed from the theme back when
`go_to_active_debug_line` ran. A theme switch goes through
`theme_changed`, which refreshes brackets, semantic tokens, and outline
symbols but never re-applies that highlight, so it stays stale.
Re-running `go_to_active_debug_line` from `theme_changed` re-resolves
the color against the current theme.

## Testing

Added a regression test in `debugger_ui` that stops at a debug line,
swaps the theme's `editor.debugger_active_line.background`, and checks
the highlight follows. It fails on `main` and passes with the fix.

Also tested by hand on Windows: started a debugpy session, paused at a
breakpoint, switched themes from the theme selector, and watched the
active line recolor live without stepping or restarting.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

Paused at a breakpoint, switching themes from the theme selector.

| Before | After |
| --- | --- |
|
https://github.com/user-attachments/assets/653a7e1b-3a99-4316-b1c9-b16ed7a7a8ba
|
https://github.com/user-attachments/assets/22a4c876-30f2-44c5-aad9-0f860639074c
|

---

Release Notes:

- Fixed the active debug line color not updating when switching themes
while the debugger is paused
([#58736](https://github.com/zed-industries/zed/issues/58736)).

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
This commit is contained in:
João Soares 2026-06-16 14:42:36 -03:00 • committed by GitHub
parent 6f31ec3328
commit 84b753cb51
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 43 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/agent_ui/src/inline_assistant.rs
View file

@ -1354,7 +1354,7 @@ impl InlineAssistant {
for row_range in inserted_row_ranges {
editor.highlight_rows::<InlineAssist>(
row_range,
cx.theme().status().info_background,
|cx| cx.theme().status().info_background,
Default::default(),
cx,
);
@ -1423,7 +1423,7 @@ impl InlineAssistant {
editor.set_show_edit_predictions(Some(false), window, cx);
editor.highlight_rows::<DeletedLines>(
Anchor::Min..Anchor::Max,
cx.theme().status().deleted_background,
|cx| cx.theme().status().deleted_background,
Default::default(),
cx,
);

40
crates/debugger_ui/src/tests/debugger_panel.rs
View file

@ -1600,7 +1600,7 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
cx.run_until_parked();
main_editor.update_in(cx, |editor, window, cx| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
assert_eq!(
active_debug_lines.len(),
@ -1616,8 +1616,8 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
assert_eq!(point.row, 1);
});
second_editor.update(cx, |editor, _| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
second_editor.update(cx, |editor, cx| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
assert!(
active_debug_lines.is_empty(),
@ -1675,7 +1675,7 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
cx.run_until_parked();
second_editor.update_in(cx, |editor, window, cx| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
assert_eq!(
active_debug_lines.len(),
@ -1691,8 +1691,8 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
assert_eq!(point.row, 2);
});
main_editor.update(cx, |editor, _| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
main_editor.update(cx, |editor, cx| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
assert!(
active_debug_lines.is_empty(),
@ -1714,8 +1714,8 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
cx.run_until_parked();
second_editor.update(cx, |editor, _| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
second_editor.update(cx, |editor, cx| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
assert!(
active_debug_lines.is_empty(),
@ -1723,8 +1723,8 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
);
});
main_editor.update(cx, |editor, _| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
main_editor.update(cx, |editor, cx| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
assert!(
active_debug_lines.is_empty(),
@ -1741,8 +1741,8 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
shutdown_session.await.unwrap();
main_editor.update(cx, |editor, _| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
main_editor.update(cx, |editor, cx| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
assert!(
active_debug_lines.is_empty(),
@ -1750,8 +1750,8 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
);
});
second_editor.update(cx, |editor, _| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
second_editor.update(cx, |editor, cx| {
let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
assert!(
active_debug_lines.is_empty(),
@ -2076,7 +2076,7 @@ async fn test_breakpoint_jumps_only_in_proper_split_view(
if let Some(editor) = item.to_any_view().downcast::<Editor>().ok() {
total_active_debug_lines += editor
.read(cx)
.highlighted_rows::<ActiveDebugLine>()
.highlighted_rows::<ActiveDebugLine>(cx)
.count();
}
}
@ -2096,7 +2096,7 @@ async fn test_breakpoint_jumps_only_in_proper_split_view(
let active_debug_lines: Vec<_> = pane_b_editor
.read(cx)
.highlighted_rows::<ActiveDebugLine>()
.highlighted_rows::<ActiveDebugLine>(cx)
.collect();
assert_eq!(
@ -2170,7 +2170,7 @@ async fn test_breakpoint_jumps_only_in_proper_split_view(
let active_debug_lines: Vec<_> = pane_b_editor
.read(cx)
.highlighted_rows::<ActiveDebugLine>()
.highlighted_rows::<ActiveDebugLine>(cx)
.collect();
assert_eq!(
@ -2190,7 +2190,7 @@ async fn test_breakpoint_jumps_only_in_proper_split_view(
if let Some(editor) = item.to_any_view().downcast::<Editor>().ok() {
total_active_debug_lines += editor
.read(cx)
.highlighted_rows::<ActiveDebugLine>()
.highlighted_rows::<ActiveDebugLine>(cx)
.count();
}
}
@ -2304,7 +2304,7 @@ async fn test_breakpoint_jumps_only_in_proper_split_view(
let active_debug_lines: Vec<_> = pane_c_editor
.read(cx)
.highlighted_rows::<ActiveDebugLine>()
.highlighted_rows::<ActiveDebugLine>(cx)
.collect();
assert_eq!(
@ -2324,7 +2324,7 @@ async fn test_breakpoint_jumps_only_in_proper_split_view(
if let Some(editor) = item.to_any_view().downcast::<Editor>().ok() {
total_active_debug_lines += editor
.read(cx)
.highlighted_rows::<ActiveDebugLine>()
.highlighted_rows::<ActiveDebugLine>(cx)
.count();
}
}

4
crates/debugger_ui/src/tests/stack_frame_list.rs
View file

@ -345,7 +345,7 @@ async fn test_select_stack_frame(executor: BackgroundExecutor, cx: &mut TestAppC
let snapshot = editor.snapshot(window, cx);
editor
.highlighted_rows::<editor::ActiveDebugLine>()
.highlighted_rows::<editor::ActiveDebugLine>(cx)
.map(|(range, _)| {
let start = range.start.to_point(&snapshot.buffer_snapshot());
let end = range.end.to_point(&snapshot.buffer_snapshot());
@ -408,7 +408,7 @@ async fn test_select_stack_frame(executor: BackgroundExecutor, cx: &mut TestAppC
let snapshot = editor.snapshot(window, cx);
editor
.highlighted_rows::<editor::ActiveDebugLine>()
.highlighted_rows::<editor::ActiveDebugLine>(cx)
.map(|(range, _)| {
let start = range.start.to_point(&snapshot.buffer_snapshot());
let end = range.end.to_point(&snapshot.buffer_snapshot());

2
crates/editor/src/edit_prediction.rs
View file

@ -399,7 +399,7 @@ impl Editor {
));
self.highlight_rows::<EditPredictionPreview>(
target..target,
cx.theme().colors().editor_highlighted_line_background,
|cx| cx.theme().colors().editor_highlighted_line_background,
RowHighlightOptions {
autoscroll: true,
..Default::default()

18
crates/editor/src/editor.rs
View file

@ -613,9 +613,6 @@ impl EditorActionId {
}
}
// type GetFieldEditorTheme = dyn Fn(&theme::Theme) -> theme::FieldEditor;
// type OverrideTextStyle = dyn Fn(&EditorStyle) -> Option<HighlightStyle>;
type BackgroundHighlight = (
Arc<dyn Fn(&usize, &Theme) -> Hsla + Send + Sync>,
Arc<[Range<Anchor>]>,
@ -1493,7 +1490,7 @@ impl Default for RowHighlightOptions {
struct RowHighlight {
index: usize,
range: Range<Anchor>,
color: Hsla,
color: fn(&App) -> Hsla,
options: RowHighlightOptions,
type_id: TypeId,
}
@ -6219,7 +6216,7 @@ impl Editor {
self.go_to_line::<ActiveDebugLine>(
multibuffer_anchor,
Some(cx.theme().colors().editor_debugger_active_line_background),
|cx| cx.theme().colors().editor_debugger_active_line_background,
window,
cx,
);
@ -8626,7 +8623,7 @@ impl Editor {
pub fn highlight_rows<T: 'static>(
&mut self,
range: Range<Anchor>,
color: Hsla,
color: fn(&App) -> Hsla,
options: RowHighlightOptions,
cx: &mut Context<Self>,
) {
@ -8738,12 +8735,15 @@ impl Editor {
}
/// For a highlight given context type, gets all anchor ranges that will be used for row highlighting.
pub fn highlighted_rows<T: 'static>(&self) -> impl '_ + Iterator<Item = (Range<Anchor>, Hsla)> {
pub fn highlighted_rows<'a, T: 'static>(
&'a self,
cx: &'a App,
) -> impl 'a + Iterator<Item = (Range<Anchor>, Hsla)> {
self.highlighted_rows
.get(&TypeId::of::<T>())
.map_or(&[] as &[_], |vec| vec.as_slice())
.iter()
.map(|highlight| (highlight.range.clone(), highlight.color))
.map(|highlight| (highlight.range.clone(), (highlight.color)(cx)))
}
/// Merges all anchor ranges for all context types ever set, picking the last highlight added in case of a row conflict.
@ -8780,7 +8780,7 @@ impl Editor {
LineHighlight {
include_gutter: highlight.options.include_gutter,
border: None,
background: highlight.color.into(),
background: (highlight.color)(cx).into(),
type_id: Some(highlight.type_id),
},
);

10
crates/editor/src/navigation.rs
View file

@ -1553,7 +1553,7 @@ impl Editor {
pub(super) fn go_to_line<T: 'static>(
&mut self,
position: Anchor,
highlight_color: Option<Hsla>,
highlight_color: fn(&App) -> Hsla,
window: &mut Window,
cx: &mut Context<Self>,
) {
@ -1566,13 +1566,7 @@ impl Editor {
let start = snapshot.buffer_snapshot().anchor_before(start);
let end = snapshot.buffer_snapshot().anchor_before(end);
self.highlight_rows::<T>(
start..end,
highlight_color
.unwrap_or_else(|| cx.theme().colors().editor_highlighted_line_background),
Default::default(),
cx,
);
self.highlight_rows::<T>(start..end, highlight_color, Default::default(), cx);
if self.buffer.read(cx).is_singleton() {
self.request_autoscroll(Autoscroll::center().for_anchor(start), cx);

4
crates/git_ui/src/conflict_view.rs
View file

@ -283,8 +283,8 @@ fn update_conflict_highlighting(
let ours = buffer.buffer_anchor_range_to_anchor_range(conflict.ours.clone())?;
let theirs = buffer.buffer_anchor_range_to_anchor_range(conflict.theirs.clone())?;
let ours_background = cx.theme().colors().version_control_conflict_marker_ours;
let theirs_background = cx.theme().colors().version_control_conflict_marker_theirs;
let ours_background = |cx: &App| cx.theme().colors().version_control_conflict_marker_ours;
let theirs_background = |cx: &App| cx.theme().colors().version_control_conflict_marker_theirs;
let options = RowHighlightOptions {
include_gutter: true,

2
crates/go_to_line/src/go_to_line.rs
View file

@ -197,7 +197,7 @@ impl GoToLine {
let end = snapshot.anchor_after(end_point);
editor.highlight_rows::<GoToLineRowHighlights>(
start..end,
cx.theme().colors().editor_highlighted_line_background,
|cx| cx.theme().colors().editor_highlighted_line_background,
RowHighlightOptions {
autoscroll: true,
..Default::default()

1
crates/gpui/src/color.rs
View file

@ -956,6 +956,7 @@ impl From<Hsla> for Background {
}
}
}
impl From<Rgba> for Background {
fn from(value: Rgba) -> Self {
Background {

4
crates/outline/src/outline.rs
View file

@ -246,7 +246,7 @@ impl OutlineViewDelegate {
active_editor.clear_row_highlights::<OutlineRowHighlights>();
active_editor.highlight_rows::<OutlineRowHighlights>(
outline_item.range.start..outline_item.range.end,
cx.theme().colors().editor_highlighted_line_background,
|cx| cx.theme().colors().editor_highlighted_line_background,
RowHighlightOptions {
autoscroll: true,
..Default::default()
@ -377,7 +377,7 @@ impl PickerDelegate for OutlineViewDelegate {
self.active_editor.update(cx, |active_editor, cx| {
let highlight = active_editor
.highlighted_rows::<OutlineRowHighlights>()
.highlighted_rows::<OutlineRowHighlights>(cx)
.next();
if let Some((rows, _)) = highlight {
active_editor.change_selections(

2
crates/vim/src/command.rs
View file

@ -2549,7 +2549,7 @@ impl ShellExec {
}
editor.highlight_rows::<ShellExec>(
input_range.clone().unwrap(),
cx.theme().status().unreachable_background,
|cx| cx.theme().status().unreachable_background,
Default::default(),
cx,
);