Updated plugins
This commit is contained in:
@@ -12,7 +12,6 @@ if !exists('s:state')
|
||||
\ 'localVars': {},
|
||||
\ 'functionArgs': {},
|
||||
\ 'message': [],
|
||||
\ 'is_test': 0,
|
||||
\}
|
||||
|
||||
if go#util#HasDebug('debugger-state')
|
||||
@@ -282,7 +281,7 @@ function! go#debug#Stop() abort
|
||||
silent! exe bufwinnr(bufnr('__GODEBUG_OUTPUT__')) 'wincmd c'
|
||||
|
||||
if has('balloon_eval')
|
||||
let &noballooneval=s:ballooneval
|
||||
let &ballooneval=s:ballooneval
|
||||
let &balloonexpr=s:balloonexpr
|
||||
endif
|
||||
|
||||
@@ -507,7 +506,7 @@ function! s:out_cb(ch, msg) abort
|
||||
if has('nvim')
|
||||
let s:state['data'] = []
|
||||
let l:state = {'databuf': ''}
|
||||
|
||||
|
||||
" explicitly bind callback to state so that within it, self will
|
||||
" always refer to state. See :help Partial for more information.
|
||||
let l:state.on_data = function('s:on_data', [], l:state)
|
||||
@@ -589,50 +588,41 @@ function! go#debug#Start(is_test, ...) abort
|
||||
endif
|
||||
|
||||
try
|
||||
if len(a:000) > 0
|
||||
let l:pkgname = a:1
|
||||
if l:pkgname[0] == '.'
|
||||
let l:pkgname = go#package#FromPath(l:pkgname)
|
||||
endif
|
||||
else
|
||||
let l:pkgname = go#package#FromPath(getcwd())
|
||||
endif
|
||||
|
||||
if l:pkgname is -1
|
||||
call go#util#EchoError('could not determine package name')
|
||||
return
|
||||
endif
|
||||
|
||||
" cd in to test directory; this is also what running "go test" does.
|
||||
if a:is_test
|
||||
" TODO(bc): Either remove this if it's ok to do so or else record it and
|
||||
" reset cwd after the job completes.
|
||||
lcd %:p:h
|
||||
endif
|
||||
|
||||
let s:state.is_test = a:is_test
|
||||
|
||||
let l:args = []
|
||||
if len(a:000) > 1
|
||||
let l:args = ['--'] + a:000[1:]
|
||||
endif
|
||||
|
||||
let l:cmd = [
|
||||
\ dlv,
|
||||
\ (a:is_test ? 'test' : 'debug'),
|
||||
\ l:pkgname,
|
||||
\]
|
||||
|
||||
" append the package when it's given.
|
||||
if len(a:000) > 0
|
||||
let l:pkgname = go#package#FromPath(a:1)
|
||||
if l:pkgname is -1
|
||||
call go#util#EchoError('could not determine package name')
|
||||
return
|
||||
endif
|
||||
|
||||
let l:cmd += [l:pkgname]
|
||||
endif
|
||||
|
||||
let l:cmd += [
|
||||
\ '--output', tempname(),
|
||||
\ '--headless',
|
||||
\ '--api-version', '2',
|
||||
\ '--log', '--log-output', 'debugger,rpc',
|
||||
\ '--listen', go#config#DebugAddress(),
|
||||
\]
|
||||
let l:debugLogOutput = go#config#DebugLogOutput()
|
||||
if l:debugLogOutput != ''
|
||||
let cmd += ['--log', '--log-output', l:debugLogOutput]
|
||||
endif
|
||||
|
||||
let buildtags = go#config#BuildTags()
|
||||
let l:buildtags = go#config#BuildTags()
|
||||
if buildtags isnot ''
|
||||
let l:cmd += ['--build-flags', '--tags=' . buildtags]
|
||||
endif
|
||||
let l:cmd += l:args
|
||||
|
||||
if len(a:000) > 1
|
||||
let l:cmd += ['--'] + a:000[1:]
|
||||
endif
|
||||
|
||||
let s:state['message'] = []
|
||||
let l:opts = {
|
||||
|
||||
Reference in New Issue
Block a user