From 76e512f9445b2a26655248b46cf13413f9a6bbba Mon Sep 17 00:00:00 2001
From: Matt
Date: Fri, 16 Feb 2024 15:43:14 +0100
Subject: Remove unwrap on line option, preventing DAP crash (#9632)

* Remove unwrap on line option, preventing DAP crash, ref #4683

* Update to fall back to existing values for option fields---
 helix-view/src/handlers/dap.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'helix-view')

diff --git a/helix-view/src/handlers/dap.rs b/helix-view/src/handlers/dap.rs
index e1437bef..a5fa0c29 100644
--- a/helix-view/src/handlers/dap.rs
+++ b/helix-view/src/handlers/dap.rs
@@ -226,10 +226,15 @@ impl Editor {
                                     breakpoints.iter().position(|b| b.id == breakpoint.id)
                                 {
                                     breakpoints[i].verified = breakpoint.verified;
-                                    breakpoints[i].message = breakpoint.message.clone();
-                                    breakpoints[i].line =
-                                        breakpoint.line.unwrap().saturating_sub(1); // TODO: no unwrap
-                                    breakpoints[i].column = breakpoint.column;
+                                    breakpoints[i].message = breakpoint
+                                        .message
+                                        .clone()
+                                        .or_else(|| breakpoints[i].message.take());
+                                    breakpoints[i].line = breakpoint
+                                        .line
+                                        .map_or(breakpoints[i].line, |line| line.saturating_sub(1));
+                                    breakpoints[i].column =
+                                        breakpoint.column.or(breakpoints[i].column);
                                 }
                             }
                         }
-- 
cgit v1.2.3-70-g09d2