From c3837a46ff5f31e9b18f8f86b6e464bed1fe20d1 Mon Sep 17 00:00:00 2001 From: Ubaldo Tiberi Date: Sun, 14 Jul 2024 16:58:32 +0200 Subject: [PATCH] runtime(termdebug): fix a few issues Fix a few minor issues: 1. filename with whitespaces issue should be fixed now, fixes: #12357 2. ":Termdebug args" should work now, fixes: #15254 closes: #15261 Signed-off-by: Christian Brabandt Signed-off-by: Ubaldo Tiberi --- runtime/pack/dist/opt/termdebug/plugin/termdebug.vim | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim index dc8b4adc34..58d526d6a6 100644 --- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim +++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim @@ -522,7 +522,7 @@ def CreateGdbConsole(dict: dict, pty: string, commpty: string): string # ---- gdb started. Next, let's set the MI interface. --- # Set arguments to be run. - if len(proc_args) + if !empty(proc_args) term_sendkeys(gdbbufnr, $"server set args {join(proc_args)}\r") endif @@ -1321,12 +1321,8 @@ def DeleteCommands() endif sign_unplace('TermDebug') - breakpoints = {} - breakpoint_locations = {} - sign_undefine('debugPC') sign_undefine(BreakpointSigns->map("'debugBreakpoint' .. v:val")) - BreakpointSigns = [] enddef @@ -1339,7 +1335,7 @@ def Until(at: string) ch_log('assume that program is running after this command') # Use the fname:lnum format - var AT = empty(at) ? $"{fnameescape(expand('%:p'))}:{line('.')}" : at + var AT = empty(at) ? $"\"{expand('%:p')}:{line('.')}\"" : at SendCommand($'-exec-until {AT}') else ch_log('dropping command, program is running: exec-until') @@ -1358,7 +1354,7 @@ def SetBreakpoint(at: string, tbreak=false) endif # Use the fname:lnum format, older gdb can't handle --source. - var AT = empty(at) ? $"{fnameescape(expand('%:p'))}:{line('.')}" : at + var AT = empty(at) ? $"\"{expand('%:p')}:{line('.')}\"" : at var cmd = '' if tbreak cmd = $'-break-insert -t {AT}'