Streamline DAP methods for breakpoint manipulation

Author: lionel-

crates/ark/src/console_annotate.rs

@@ -897,9 +897,7 @@ pub unsafe extern "C-unwind" fn ps_annotate_source(code: SEXP, uri: SEXP) -> any
     };
 
     // Notify frontend about any breakpoints marked invalid during annotation
-    if let Some((_, breakpoints)) = dap_guard.breakpoints.get(&uri) {
-        dap_guard.notify_invalid_breakpoints(breakpoints);
-    }
+    dap_guard.notify_invalid_breakpoints(&uri);
 
     // Remove disabled breakpoints. Their verification state is now stale since
     // they weren't injected during this annotation. If the user re-enables

crates/ark/src/dap/dap.rs

@@ -424,10 +424,13 @@ impl Dap {
 
     /// Notify the frontend about breakpoints that were marked invalid during annotation.
     /// Sends a `BreakpointState` event with verified=false and a message for each.
-    pub fn notify_invalid_breakpoints(&self, breakpoints: &[Breakpoint]) {
+    pub fn notify_invalid_breakpoints(&self, uri: &Url) {
         let Some(tx) = &self.backend_events_tx else {
             return;
         };
+        let Some((_, breakpoints)) = self.breakpoints.get(uri) else {
+            return;
+        };
 
         for bp in breakpoints {
             let BreakpointState::Invalid(reason) = &bp.state else {
@@ -443,6 +446,14 @@ impl Dap {
         }
     }
 
+    /// Remove disabled breakpoints for a given URI.
+    pub fn remove_disabled_breakpoints(&mut self, uri: &Url) {
+        let Some((_, bps)) = self.breakpoints.get_mut(uri) else {
+            return;
+        };
+        bps.retain(|bp| !matches!(bp.state, BreakpointState::Disabled));
+    }
+
     pub(crate) fn is_breakpoint_enabled(&self, uri: &Url, id: String) -> bool {
         let Some((_, breakpoints)) = self.breakpoints.get(uri) else {
             return false;

crates/ark/src/interface.rs

@@ -101,7 +101,6 @@ use uuid::Uuid;
 use crate::console_annotate::annotate_input;
 use crate::console_debug::FrameInfoId;
 use crate::dap::dap::Breakpoint;
-use crate::dap::dap::BreakpointState;
 use crate::dap::dap::DapBackendEvent;
 use crate::dap::Dap;
 use crate::errors::stack_overflow_occurred;
@@ -1445,20 +1444,11 @@ impl RMain {
                     },
                 }
 
-                // Notify frontend about any breakpoints marked invalid during annotation
+                // Notify frontend about any breakpoints marked invalid during annotation.
+                // Remove disabled breakpoints.
                 if let Some(uri) = &uri {
-                    if let Some((_, bps)) = dap_guard.breakpoints.get(uri) {
-                        dap_guard.notify_invalid_breakpoints(bps);
-                    }
-                }
-
-                // Remove disabled breakpoints. Their verification state is now stale since
-                // they weren't injected during this annotation. If the user re-enables
-                // them, they'll be treated as new unverified breakpoints.
-                if let Some(uri) = &uri {
-                    if let Some((_, bps)) = dap_guard.breakpoints.get_mut(uri) {
-                        bps.retain(|bp| !matches!(bp.state, BreakpointState::Disabled));
-                    }
+                    dap_guard.notify_invalid_breakpoints(uri);
+                    dap_guard.remove_disabled_breakpoints(uri);
                 }
 
                 drop(dap_guard);