@@ -2,7 +2,7 @@ use std::fmt::Write;
22
33use crate::{
44 editor::GutterType,
5− graphics::{Color, Style, UnderlineStyle},
5+ graphics::{Style, UnderlineStyle},
66 Document, Editor, Theme, View,
77};
88
@@ -245,9 +245,9 @@ pub fn breakpoints<'doc>(
245245 theme: &Theme,
246246 _is_focused: bool,
247247) -> GutterFn<'doc> {
248− let warning = theme.get("warning");
249248 let error = theme.get("error");
250249 let info = theme.get("info");
250+ let breakpoint_style = theme.get("ui.debug.breakpoint");
251251
252252 let breakpoints = doc.path().and_then(|path| editor.breakpoints.get(path));
253253
@@ -265,30 +265,52 @@ pub fn breakpoints<'doc>(
265265 .iter()
266266 .find(|breakpoint| breakpoint.line == line)?;
267267
268− let mut style = if breakpoint.condition.is_some() && breakpoint.log_message.is_some() {
268+ let style = if breakpoint.condition.is_some() && breakpoint.log_message.is_some() {
269269 error.underline_style(UnderlineStyle::Line)
270270 } else if breakpoint.condition.is_some() {
271271 error
272272 } else if breakpoint.log_message.is_some() {
273273 info
274274 } else {
275− warning
275+ breakpoint_style
276276 };
277277
278− if !breakpoint.verified {
279− // Faded colors
280− style = if let Some(Color::Rgb(r, g, b)) = style.fg {
281− style.fg(Color::Rgb(
282− ((r as f32) * 0.4).floor() as u8,
283− ((g as f32) * 0.4).floor() as u8,
284− ((b as f32) * 0.4).floor() as u8,
285− ))
286− } else {
287− style.fg(Color::Gray)
288− }
289− };
278+ let sym = if breakpoint.verified { "●" } else { "◯" };
279+ write!(out, "{}", sym).unwrap();
280+ Some(style)
281+ },
282+ )
283+}
284+
285+fn execution_pause_indicator<'doc>(
286+ editor: &'doc Editor,
287+ doc: &'doc Document,
288+ theme: &Theme,
289+ is_focused: bool,
290+) -> GutterFn<'doc> {
291+ let style = theme.get("ui.debug.active");
292+ let current_stack_frame = editor.current_stack_frame();
293+ let frame_line = current_stack_frame.map(|frame| frame.line - 1);
294+ let frame_source_path = current_stack_frame.map(|frame| {
295+ frame
296+ .source
297+ .as_ref()
298+ .and_then(|source| source.path.as_ref())
299+ });
300+ let should_display_for_current_doc =
301+ doc.path().is_some() && frame_source_path.unwrap_or(None) == doc.path();
302+
303+ Box::new(
304+ move |line: usize, _selected: bool, first_visual_line: bool, out: &mut String| {
305+ if !first_visual_line
306+ || !is_focused
307+ || line != frame_line?
308+ || !should_display_for_current_doc
309+ {
310+ return None;
311+ }
290312
291− let sym = if breakpoint.verified { "▲" } else { "⊚" };
313+ let sym = "▶";
292314 write!(out, "{}", sym).unwrap();
293315 Some(style)
294316 },
@@ -304,9 +326,11 @@ pub fn diagnostics_or_breakpoints<'doc>(
304326) -> GutterFn<'doc> {
305327 let mut diagnostics = diagnostic(editor, doc, view, theme, is_focused);
306328 let mut breakpoints = breakpoints(editor, doc, view, theme, is_focused);
329+ let mut execution_pause_indicator = execution_pause_indicator(editor, doc, theme, is_focused);
307330
308331 Box::new(move |line, selected, first_visual_line: bool, out| {
309− breakpoints(line, selected, first_visual_line, out)
332+ execution_pause_indicator(line, selected, first_visual_line, out)
333+ .or_else(|| breakpoints(line, selected, first_visual_line, out))
310334 .or_else(|| diagnostics(line, selected, first_visual_line, out))
311335 })
312336}