From 09f5796537ffe0ae6b1278fc4d783a7c2eb4b8c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= Date: Sun, 7 Nov 2021 22:03:55 +0900 Subject: [PATCH] dap: Simplify get_breakpoint_at_current_line --- helix-term/src/commands.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 0b617dc8..12dd2460 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -2268,13 +2268,13 @@ mod cmd { let pos = doc.selection(view.id).primary().cursor(text); let line = text.char_to_line(pos) + 1; // 1-indexing in DAP, 0-indexing in Helix let path = match doc.path() { - Some(path) => path.to_path_buf(), + Some(path) => path, None => return None, }; - let vec = vec![]; - let breakpoints = editor.breakpoints.get(&path).unwrap_or(&vec); - let i = breakpoints.iter().position(|b| b.line == line); - i.map(|i| (i, breakpoints.get(i).unwrap().clone())) + editor.breakpoints.get(path).and_then(|breakpoints| { + let i = breakpoints.iter().position(|b| b.line == line); + i.map(|i| (i, breakpoints[i].clone())) + }) } fn debug_start(