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

Support *\$var in lists to splat (expand in place) shell-split user input. Useful for commandline-> args list

Browse source
This commit is contained in:
Ben Jackson 2020-01-31 11:53:37 +00:00 • committed by Ben Jackson
commit 2c1060c49e
1 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

31
python3/vimspector/utils.py
View file

@ -21,6 +21,9 @@ import vim
import json import json
import string import string
import functools import functools
import subprocess
import shlex
LOG_FILE = os.path.expanduser( os.path.join( '~', '.vimspector.log' ) ) LOG_FILE = os.path.expanduser( os.path.join( '~', '.vimspector.log' ) )
@ -346,10 +349,27 @@ def ExpandReferencesInObject( obj, mapping, user_choices ):
if isinstance( obj, dict ): if isinstance( obj, dict ):
ExpandReferencesInDict( obj, mapping, user_choices ) ExpandReferencesInDict( obj, mapping, user_choices )
elif isinstance( obj, list ): elif isinstance( obj, list ):
for i, _ in enumerate( obj ): j_offset = 0
# FIXME: We are assuming that it is a list of string, but could be a obj_copy = list( obj )
# list of list of a list of dict, etc.
obj[ i ] = ExpandReferencesInObject( obj[ i ], mapping, user_choices ) for i, _ in enumerate( obj_copy ):
j = i + j_offset
if ( isinstance( obj_copy[ i ], str ) and
len( obj_copy[ i ] ) > 2 and
obj_copy[ i ][ 0:2 ] == '*$' ):
# *${something} - expand list in place
value = ExpandReferencesInString( obj_copy[ i ][ 1: ],
mapping,
user_choices )
obj.pop( j )
j_offset -= 1
for opt_index, opt in enumerate( shlex.split( value ) ):
obj.insert( j + opt_index, opt )
j_offset += 1
else:
obj[ j ] = ExpandReferencesInObject( obj_copy[ i ],
mapping,
user_choices )
elif isinstance( obj, str ): elif isinstance( obj, str ):
obj = ExpandReferencesInString( obj, mapping, user_choices ) obj = ExpandReferencesInString( obj, mapping, user_choices )
@ -409,9 +429,6 @@ def ParseVariables( variables_list, mapping, user_choices ):
for n, v in variables.items(): for n, v in variables.items():
if isinstance( v, dict ): if isinstance( v, dict ):
if 'shell' in v: if 'shell' in v:
import subprocess
import shlex
new_v = v.copy() new_v = v.copy()
# Bit of a hack. Allows environment variables to be used. # Bit of a hack. Allows environment variables to be used.
ExpandReferencesInDict( new_v, new_mapping, user_choices ) ExpandReferencesInDict( new_v, new_mapping, user_choices )