1 files changed, 73 insertions, 2 deletions

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 4da8bfd5..92a631ed 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -15,6 +15,7 @@ use helix_core::{
     unicode::width::UnicodeWidthStr,
     LineEnding, Position, Range, Selection,
 };
+use helix_dap::{SourceBreakpoint, StackFrame};
 use helix_view::{
     document::Mode,
     editor::LineNumber,
@@ -71,6 +72,7 @@ impl EditorView {
         is_focused: bool,
         loader: &syntax::Loader,
         config: &helix_view::editor::Config,
+        debugger: &Option<helix_dap::Client>,
     ) {
         let inner = view.inner_area();
         let area = view.area;
@@ -87,7 +89,9 @@ impl EditorView {
         };
 
         Self::render_text_highlights(doc, view.offset, inner, surface, theme, highlights);
-        Self::render_gutter(doc, view, view.area, surface, theme, is_focused, config);
+        Self::render_gutter(
+            doc, view, view.area, surface, theme, is_focused, config, debugger,
+        );
 
         if is_focused {
             Self::render_focused_view_elements(view, doc, inner, theme, surface);
@@ -106,7 +110,7 @@ impl EditorView {
             }
         }
 
-        self.render_diagnostics(doc, view, inner, surface, theme);
+        self.render_diagnostics(doc, view, inner, surface, theme, debugger);
 
         let statusline_area = view
             .area
@@ -409,6 +413,7 @@ impl EditorView {
         theme: &Theme,
         is_focused: bool,
         config: &helix_view::editor::Config,
+        debugger: &Option<helix_dap::Client>,
     ) {
         let text = doc.text().slice(..);
         let last_line = view.last_line(doc);
@@ -438,6 +443,15 @@ impl EditorView {
             .map(|range| range.cursor_line(text))
             .collect();
 
+        let mut breakpoints: Option<Vec<SourceBreakpoint>> = None;
+        let mut stack_pointer: Option<StackFrame> = None;
+        if let Some(debugger) = debugger {
+            if let Some(path) = doc.path() {
+                breakpoints = debugger.breakpoints.get(path).cloned();
+                stack_pointer = debugger.stack_pointer.clone()
+            }
+        }
+
         for (i, line) in (view.offset.row..(last_line + 1)).enumerate() {
             use helix_core::diagnostic::Severity;
             if let Some(diagnostic) = doc.diagnostics().iter().find(|d| d.line == line) {
@@ -457,6 +471,36 @@ impl EditorView {
 
             let selected = cursors.contains(&line);
 
+            if let Some(bps) = breakpoints.as_ref() {
+                if let Some(breakpoint) = bps.iter().find(|breakpoint| breakpoint.line - 1 == line)
+                {
+                    if breakpoint.condition.is_some() {
+                        surface.set_stringn(viewport.x, viewport.y + i as u16, "▲", 1, error);
+                    } else if breakpoint.log_message.is_some() {
+                        surface.set_stringn(viewport.x, viewport.y + i as u16, "▲", 1, info);
+                    } else {
+                        surface.set_stringn(viewport.x, viewport.y + i as u16, "▲", 1, warning);
+                    }
+                }
+            }
+
+            if let Some(sp) = stack_pointer.as_ref() {
+                if let Some(src) = sp.source.as_ref() {
+                    if doc
+                        .path()
+                        .map(|path| src.path == Some(path.clone()))
+                        .unwrap_or(false)
+                        && sp.line - 1 == line
+                    {
+                        surface.set_style(
+                            Rect::new(viewport.x, viewport.y + i as u16, 6, 1),
+                            helix_view::graphics::Style::default()
+                                .bg(helix_view::graphics::Color::LightYellow),
+                        );
+                    }
+                }
+            }
+
             let text = if line == last_line && !draw_last {
                 "    ~".into()
             } else {
@@ -487,6 +531,7 @@ impl EditorView {
         viewport: Rect,
         surface: &mut Surface,
         theme: &Theme,
+        debugger: &Option<helix_dap::Client>,
     ) {
         use helix_core::diagnostic::Severity;
         use tui::{
@@ -524,6 +569,31 @@ impl EditorView {
             lines.extend(text.lines);
         }
 
+        if let Some(debugger) = debugger {
+            if let Some(path) = doc.path() {
+                if let Some(breakpoints) = debugger.breakpoints.get(path) {
+                    let line = doc.text().char_to_line(cursor);
+                    if let Some(breakpoint) = breakpoints
+                        .iter()
+                        .find(|breakpoint| breakpoint.line - 1 == line)
+                    {
+                        if let Some(condition) = &breakpoint.condition {
+                            lines.extend(
+                                Text::styled(condition, info.add_modifier(Modifier::UNDERLINED))
+                                    .lines,
+                            );
+                        }
+                        if let Some(log_message) = &breakpoint.log_message {
+                            lines.extend(
+                                Text::styled(log_message, info.add_modifier(Modifier::UNDERLINED))
+                                    .lines,
+                            );
+                        }
+                    }
+                }
+            }
+        }
+
         let paragraph = Paragraph::new(lines).alignment(Alignment::Right);
         let width = 80.min(viewport.width);
         let height = 15.min(viewport.height);
@@ -1010,6 +1080,7 @@ impl Component for EditorView {
                 is_focused,
                 loader,
                 &cx.editor.config,
+                &cx.editor.debugger,
             );
         }