235a84d · helix · git.iko.soy

helix-term/src/commands.rs−7

compare with master

unifiedsplit

@@ -305,7 +305,6 @@ impl Command {

305 select_textobject_around, "Select around object",

306 select_textobject_inner, "Select inside object",

307 dap_toggle_breakpoint, "Toggle breakpoint",

308− dap_start, "Start debug session",

309 dap_run, "Begin program execution",

308 dap_run, "Begin program execution",

310 dap_continue, "Continue program execution",

309 dap_continue, "Continue program execution",

311 dap_pause, "Pause program execution",

310 dap_pause, "Pause program execution",

@@ -4491,12 +4490,6 @@ fn dap_start_impl(editor: &mut Editor, name: Option<&str>, params: Option<Vec<&s

4491 editor.debugger_events.push(stream);

4490 editor.debugger_events.push(stream);

4492}

4491}

4493

4492

4494−fn dap_start(cx: &mut Context) {

4495− // TODO: check that first config does not have templates

4496− // which cannot be handled with a shortcut

4497− dap_start_impl(&mut cx.editor, None, None);

4498−}

4499−

4500fn dap_toggle_breakpoint(cx: &mut Context) {

4493fn dap_toggle_breakpoint(cx: &mut Context) {

4501 use helix_lsp::block_on;

4494 use helix_lsp::block_on;

4502

4495

helix-term/src/keymap.rs−1

@@ -486,7 +486,6 @@ impl Default for Keymaps {

486 "a" => code_action,

487 "'" => last_picker,

488 "d" => { "Debug"

489− "s" => dap_start,

490 "b" => dap_toggle_breakpoint,

489 "b" => dap_toggle_breakpoint,

491 "r" => dap_run,

490 "r" => dap_run,

492 "c" => dap_continue,

491 "c" => dap_continue,

languages.toml+4−4

@@ -97,7 +97,7 @@ port-arg = "-p {}"

97[[language.debugger.templates]]

98name = "binary"

99request = "launch"

100−args = { console = "internalConsole", program = "main" }

100+args = { console = "internalConsole", program = "{0}" }

101

102[[language.debugger.templates]]

103name = "attach"

@@ -125,7 +125,7 @@ port-arg = "-p {}"

125[[language.debugger.templates]]

126name = "binary"

127request = "launch"

128−args = { console = "internalConsole", program = "main" }

128+args = { console = "internalConsole", program = "{0}" }

129

130[[language.debugger.templates]]

131name = "attach"

@@ -155,12 +155,12 @@ port-arg = "-l 127.0.0.1:{}"

155[[language.debugger.templates]]

156name = "source"

157request = "launch"

158−args = { mode = "debug", program = "main.go" }

158+args = { mode = "debug", program = "{0}" }

159

160[[language.debugger.templates]]

161name = "binary"

162request = "launch"

163−args = { mode = "exec", program = "./main" }

163+args = { mode = "exec", program = "{0}" }

164

165[[language.debugger.templates]]

166name = "test"