jyapayne/vimspector
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hackaround for missing 'env' in termopen and jobstart in neovim

Browse source
This commit is contained in:
Ben Jackson 2020-02-02 17:31:05 +00:00
commit 896b20f490
2 changed files with 56 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

30
autoload/vimspector/internal/neojob.vim
View file

@ -44,17 +44,27 @@ function! vimspector#internal#neojob#StartDebugSession( config ) abort
return v:false
endif
let s:job = jobstart( a:config[ 'command' ],
\ {
\ 'on_stdout': funcref( 's:_OnEvent' ),
\ 'on_stderr': funcref( 's:_OnEvent' ),
\ 'on_exit': funcref( 's:_OnEvent' ),
\ 'cwd': a:config[ 'cwd' ],
\ 'env': a:config[ 'env' ],
\ }
\ )
" FIXME: env might not work: Missing in neovim 0.4. But in master:
" HACK: Workaround for 'env' not being supported.
let old_env={}
try
let old_env = vimspector#internal#neoterm#PrepareEnvironment(
\ a:config[ 'env' ] )
let s:job = jobstart( a:config[ 'command' ],
\ {
\ 'on_stdout': funcref( 's:_OnEvent' ),
\ 'on_stderr': funcref( 's:_OnEvent' ),
\ 'on_exit': funcref( 's:_OnEvent' ),
\ 'cwd': a:config[ 'cwd' ],
\ 'env': a:config[ 'env' ],
\ }
\ )
finally
call vimspector#internal#neoterm#ResetEnvironment( a:config[ 'env' ],
\ old_env )
endtry
return v:true
endfunction

38
autoload/vimspector/internal/neoterm.vim
View file

@ -25,6 +25,27 @@ set cpoptions&vim
" FIXME: Tidy this map when buffers are closed ?
let s:buffer_to_id = {}
function! vimspector#internal#neoterm#PrepareEnvironment( env ) abort
let old_env = {}
let new_env = copy( environ() )
for key in keys( a:env )
if has_key( new_env, key )
let old_env[ key ] = new_env[ key ]
endif
call setenv( key, a:env[ key ] )
endfor
return old_env
endfunction
function! vimspector#internal#neoterm#ResetEnvironment( env, old_env ) abort
for key in keys( a:env )
let value = get( a:old_env, key, v:null )
call setenv( key, value )
endfor
endfunction
function! vimspector#internal#neoterm#Start( cmd, opts ) abort
if ! get( a:opts, 'curwin', 0 )
if get( a:opts, 'vertical', 0 )
@ -34,8 +55,21 @@ function! vimspector#internal#neoterm#Start( cmd, opts ) abort
endif
endif
" FIXME: 'env' doesn't work
let id = termopen( a:cmd, { 'cwd': a:opts[ 'cwd' ] } )
" HACK: Neovim's termopen doesn't support env
let old_env={}
try
let old_env = vimspector#internal#neoterm#PrepareEnvironment(
\ a:opts[ 'env' ] )
let id = termopen( a:cmd, {
\ 'cwd': a:opts[ 'cwd' ],
\ 'env': a:opts[ 'env' ],
\ } )
finally
call vimspector#internal#neoterm#ResetEnvironment( a:opts[ 'env' ],
\ old_env )
endtry
let bufnr = bufnr()
let s:buffer_to_id[ bufnr ] = id
return bufnr