Improve lua configuration and test files

Change lua test files to call `require 'lldebugger'` only when using
love, because it's not needed with lua or luajit. Also add `stopOnEntry`
key to test `.vimspector.json` because it works correctly with this
change.
This commit is contained in:
Eduardo Mezêncio 2020-11-22 18:38:40 -03:00
commit 4f03e4f65a
5 changed files with 11 additions and 21 deletions

View file

@ -10,7 +10,8 @@
"program": { "program": {
"command": "love" "command": "love"
}, },
"args": ["${workspaceFolder}"] "args": ["${workspaceFolder}"],
"stopOnEntry": false
} }
} }
} }

View file

@ -10,7 +10,8 @@
"program": { "program": {
"command": "love" "command": "love"
}, },
"args": ["${workspaceFolder}"] "args": ["${workspaceFolder}"],
"stopOnEntry": false
} }
} }
} }

View file

@ -9,7 +9,8 @@
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}",
"program": { "program": {
"lua": "lua", "lua": "lua",
"file": "simple.lua" "file": "simple.lua",
"stopOnEntry": false
} }
} }
}, },
@ -21,7 +22,8 @@
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}",
"program": { "program": {
"lua": "luajit", "lua": "luajit",
"file": "simple.lua" "file": "simple.lua",
"stopOnEntry": false
} }
} }
} }

View file

@ -1,7 +1,3 @@
if pcall(require, 'lldebugger') then
require('lldebugger').start()
end
local separator = ' ' local separator = ' '

View file

@ -13,30 +13,20 @@ function! BaseTest( configuration )
lcd ../support/test/lua/simple lcd ../support/test/lua/simple
exe 'edit ' . fn exe 'edit ' . fn
call vimspector#SetLineBreakpoint( fn, 9 ) call vimspector#SetLineBreakpoint( fn, 5 )
call vimspector#LaunchWithSettings( { 'configuration': a:configuration } ) call vimspector#LaunchWithSettings( { 'configuration': a:configuration } )
" This debugger is ignoring stopOnEntry when not running a custom executable
" and always stopping on the first line after setting the hook. This first
" check assumes that behavior.
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 5, 1 ) call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 5, 1 )
call WaitForAssert( {-> call WaitForAssert( {->
\ vimspector#test#signs#AssertPCIsAtLineInBuffer( fn, 5 ) \ vimspector#test#signs#AssertPCIsAtLineInBuffer( fn, 5 )
\ } ) \ } )
" Continue
call feedkeys( "\<F5>", 'xt' )
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 9, 1 )
call WaitForAssert( {->
\ vimspector#test#signs#AssertPCIsAtLineInBuffer( fn, 9 )
\ } )
" Step " Step
call feedkeys( "\<F10>", 'xt' ) call feedkeys( "\<F10>", 'xt' )
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 10, 1 ) call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 6, 1 )
call WaitForAssert( {-> call WaitForAssert( {->
\ vimspector#test#signs#AssertPCIsAtLineInBuffer( fn, 10 ) \ vimspector#test#signs#AssertPCIsAtLineInBuffer( fn, 6 )
\ } ) \ } )
call vimspector#test#setup#Reset() call vimspector#test#setup#Reset()