From 72576822f31ee2e2f88a1b627b0f5c14dc66ec37 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Mon, 22 Nov 2021 16:30:56 +0900
Subject: dap: Replace breakpoint when changed event comes through

---
 helix-term/src/application.rs | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'helix-term')

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 242dc837..c76a2e28 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -397,19 +397,20 @@ impl Application {
                             .position(|b| b.id == breakpoint.id)
                         {
                             Some(i) => {
-                                let item = debugger.breakpoints.get_mut(i).unwrap();
-                                item.verified = breakpoint.verified;
-                                // TODO: wasteful clones
-                                item.message = breakpoint.message.or_else(|| item.message.clone());
-                                item.source = breakpoint.source.or_else(|| item.source.clone());
-                                item.line = breakpoint.line.or(item.line);
-                                item.column = breakpoint.column.or(item.column);
-                                item.end_line = breakpoint.end_line.or(item.end_line);
-                                item.end_column = breakpoint.end_column.or(item.end_column);
-                                item.instruction_reference = breakpoint
-                                    .instruction_reference
-                                    .or_else(|| item.instruction_reference.clone());
-                                item.offset = breakpoint.offset.or(item.offset);
+                                debugger.breakpoints[i] = breakpoint;
+                                // let item = debugger.breakpoints.get_mut(i).unwrap();
+                                // item.verified = breakpoint.verified;
+                                // // TODO: wasteful clones
+                                // item.message = breakpoint.message.or_else(|| item.message.clone());
+                                // item.source = breakpoint.source.or_else(|| item.source.clone());
+                                // item.line = breakpoint.line.or(item.line);
+                                // item.column = breakpoint.column.or(item.column);
+                                // item.end_line = breakpoint.end_line.or(item.end_line);
+                                // item.end_column = breakpoint.end_column.or(item.end_column);
+                                // item.instruction_reference = breakpoint
+                                //     .instruction_reference
+                                //     .or_else(|| item.instruction_reference.clone());
+                                // item.offset = breakpoint.offset.or(item.offset);
                             }
                             None => {
                                 warn!("Changed breakpoint with id {:?} not found", breakpoint.id);
-- 
cgit v1.2.3-70-g09d2