forked from aniani/vim
patch 9.1.0599: Termdebug: still get E1023 when specifying arguments
Problem: Termdebug: still get E1023 when specifying arguments and using a prompt buffer. Solution: Use empty() instead of len(). Add a test. Fix wrong order of arguments to assert_equal() in Test_termdebug_basic(). (zeertzjq) closes: #15288 Signed-off-by: zeertzjq <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
4266daae17
commit
aef6179bcf
@@ -705,7 +705,7 @@ def StartDebug_prompt(dict: dict<any>)
|
|||||||
SendCommand('set breakpoint pending on')
|
SendCommand('set breakpoint pending on')
|
||||||
|
|
||||||
# Set arguments to be run
|
# Set arguments to be run
|
||||||
if len(proc_args)
|
if !empty(proc_args)
|
||||||
SendCommand($'set args {join(proc_args)}')
|
SendCommand($'set args {join(proc_args)}')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@@ -123,13 +123,13 @@ func Test_termdebug_basic()
|
|||||||
" 60 is approx spaceBuffer * 3
|
" 60 is approx spaceBuffer * 3
|
||||||
if winwidth(0) <= 78 + 60
|
if winwidth(0) <= 78 + 60
|
||||||
Var
|
Var
|
||||||
call assert_equal(winnr(), winnr('$'))
|
call assert_equal(winnr('$'), winnr())
|
||||||
call assert_equal(winlayout(), ['col', [['leaf', 1002], ['leaf', 1001], ['leaf', 1000], ['leaf', 1003 + cn]]])
|
call assert_equal(['col', [['leaf', 1002], ['leaf', 1001], ['leaf', 1000], ['leaf', 1003 + cn]]], winlayout())
|
||||||
let cn += 1
|
let cn += 1
|
||||||
bw!
|
bw!
|
||||||
Asm
|
Asm
|
||||||
call assert_equal(winnr(), winnr('$'))
|
call assert_equal(winnr('$'), winnr())
|
||||||
call assert_equal(winlayout(), ['col', [['leaf', 1002], ['leaf', 1001], ['leaf', 1000], ['leaf', 1003 + cn]]])
|
call assert_equal(['col', [['leaf', 1002], ['leaf', 1001], ['leaf', 1000], ['leaf', 1003 + cn]]], winlayout())
|
||||||
let cn += 1
|
let cn += 1
|
||||||
bw!
|
bw!
|
||||||
endif
|
endif
|
||||||
@@ -138,16 +138,16 @@ func Test_termdebug_basic()
|
|||||||
let winw = winwidth(0)
|
let winw = winwidth(0)
|
||||||
Var
|
Var
|
||||||
if winwidth(0) < winw
|
if winwidth(0) < winw
|
||||||
call assert_equal(winnr(), winnr('$') - 1)
|
call assert_equal(winnr('$') - 1, winnr())
|
||||||
call assert_equal(winlayout(), ['col', [['leaf', 1002], ['leaf', 1001], ['row', [['leaf', 1003 + cn], ['leaf', 1000]]]]])
|
call assert_equal(['col', [['leaf', 1002], ['leaf', 1001], ['row', [['leaf', 1003 + cn], ['leaf', 1000]]]]], winlayout())
|
||||||
let cn += 1
|
let cn += 1
|
||||||
bw!
|
bw!
|
||||||
endif
|
endif
|
||||||
let winw = winwidth(0)
|
let winw = winwidth(0)
|
||||||
Asm
|
Asm
|
||||||
if winwidth(0) < winw
|
if winwidth(0) < winw
|
||||||
call assert_equal(winnr(), winnr('$') - 1)
|
call assert_equal(winnr('$') - 1, winnr())
|
||||||
call assert_equal(winlayout(), ['col', [['leaf', 1002], ['leaf', 1001], ['row', [['leaf', 1003 + cn], ['leaf', 1000]]]]])
|
call assert_equal(['col', [['leaf', 1002], ['leaf', 1001], ['row', [['leaf', 1003 + cn], ['leaf', 1000]]]]], winlayout())
|
||||||
let cn += 1
|
let cn += 1
|
||||||
bw!
|
bw!
|
||||||
endif
|
endif
|
||||||
@@ -160,6 +160,18 @@ func Test_termdebug_basic()
|
|||||||
call WaitForAssert({-> assert_equal(1, winnr('$'))})
|
call WaitForAssert({-> assert_equal(1, winnr('$'))})
|
||||||
call assert_equal([], sign_getplaced('', #{group: 'TermDebug'})[0].signs)
|
call assert_equal([], sign_getplaced('', #{group: 'TermDebug'})[0].signs)
|
||||||
|
|
||||||
|
for use_prompt in [0, 1]
|
||||||
|
let g:termdebug_config = {}
|
||||||
|
let g:termdebug_config['use_prompt'] = use_prompt
|
||||||
|
TermdebugCommand ./XTD_basic arg args
|
||||||
|
call WaitForAssert({-> assert_equal(3, winnr('$'))})
|
||||||
|
wincmd t
|
||||||
|
quit!
|
||||||
|
redraw!
|
||||||
|
call WaitForAssert({-> assert_equal(1, winnr('$'))})
|
||||||
|
unlet g:termdebug_config
|
||||||
|
endfor
|
||||||
|
|
||||||
call s:cleanup_files(bin_name)
|
call s:cleanup_files(bin_name)
|
||||||
%bw!
|
%bw!
|
||||||
endfunc
|
endfunc
|
||||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
599,
|
||||||
/**/
|
/**/
|
||||||
598,
|
598,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user