suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dap: Always edit breakpoints on the correct document

pull/574/head
Blaž Hrastnik 2021-11-22 11:22:08 +09:00
parent 0eadeab8c7
commit b55ca8fdb8
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
helix-term/src/commands/dap.rs
View File

@ -353,7 +353,7 @@ fn debug_parameter_prompt(
format!("{}: ", name).into(), format!("{}: ", name).into(),
None, None,
completer, completer,
move |cx: &mut crate::compositor::Context, input: &str, event: PromptEvent| { move |cx, input: &str, event: PromptEvent| {
if event != PromptEvent::Validate { if event != PromptEvent::Validate {
return; return;
} }
@ -634,6 +634,10 @@ pub fn dap_disable_exceptions(cx: &mut Context) {
// we also might be editing a breakpoint in a document that's no longer focused // we also might be editing a breakpoint in a document that's no longer focused
pub fn dap_edit_condition(cx: &mut Context) { pub fn dap_edit_condition(cx: &mut Context) {
if let Some((pos, breakpoint)) = commands::cmd::get_breakpoint_at_current_line(cx.editor) { if let Some((pos, breakpoint)) = commands::cmd::get_breakpoint_at_current_line(cx.editor) {
let path = match doc!(cx.editor).path() {
Some(path) => path.clone(),
None => return,
};
let callback = Box::pin(async move { let callback = Box::pin(async move {
let call: Callback = let call: Callback =
Box::new(move |_editor: &mut Editor, compositor: &mut Compositor| { Box::new(move |_editor: &mut Editor, compositor: &mut Compositor| {
@ -641,25 +645,12 @@ pub fn dap_edit_condition(cx: &mut Context) {
"condition:".into(), "condition:".into(),
None, None,
|_input: &str| Vec::new(), |_input: &str| Vec::new(),
move |cx: &mut crate::compositor::Context, move |cx, input: &str, event: PromptEvent| {
input: &str,
event: PromptEvent| {
if event != PromptEvent::Validate { if event != PromptEvent::Validate {
return; return;
} }
let doc = doc!(cx.editor); let breakpoints = &mut cx.editor.breakpoints.get_mut(&path).unwrap();
let path = match doc.path() {
Some(path) => path,
None => {
cx.editor.set_status(
"Can't edit breakpoint: document has no path".to_owned(),
);
return;
}
};
let breakpoints = &mut cx.editor.breakpoints.get_mut(path).unwrap();
breakpoints[pos].condition = match input { breakpoints[pos].condition = match input {
"" => None, "" => None,
input => Some(input.to_owned()), input => Some(input.to_owned()),
@ -711,6 +702,10 @@ pub fn dap_edit_condition(cx: &mut Context) {
pub fn dap_edit_log(cx: &mut Context) { pub fn dap_edit_log(cx: &mut Context) {
if let Some((pos, breakpoint)) = commands::cmd::get_breakpoint_at_current_line(cx.editor) { if let Some((pos, breakpoint)) = commands::cmd::get_breakpoint_at_current_line(cx.editor) {
let path = match doc!(cx.editor).path() {
Some(path) => path.clone(),
None => return,
};
let callback = Box::pin(async move { let callback = Box::pin(async move {
let call: Callback = let call: Callback =
Box::new(move |_editor: &mut Editor, compositor: &mut Compositor| { Box::new(move |_editor: &mut Editor, compositor: &mut Compositor| {
@ -718,25 +713,12 @@ pub fn dap_edit_log(cx: &mut Context) {
"log-message:".into(), "log-message:".into(),
None, None,
|_input: &str| Vec::new(), |_input: &str| Vec::new(),
move |cx: &mut crate::compositor::Context, move |cx, input: &str, event: PromptEvent| {
input: &str,
event: PromptEvent| {
if event != PromptEvent::Validate { if event != PromptEvent::Validate {
return; return;
} }
let doc = doc!(cx.editor); let breakpoints = &mut cx.editor.breakpoints.get_mut(&path).unwrap();
let path = match doc.path() {
Some(path) => path,
None => {
cx.editor.set_status(
"Can't edit breakpoint: document has no path".to_owned(),
);
return;
}
};
let breakpoints = &mut cx.editor.breakpoints.get_mut(path).unwrap();
breakpoints[pos].log_message = match input { breakpoints[pos].log_message = match input {
"" => None, "" => None,
input => Some(input.to_owned()), input => Some(input.to_owned()),