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

Store variables supplied _before_ parsing adapter/config varibales

Browse source
This commit is contained in:
Ben Jackson 2020-01-17 17:44:44 +00:00
commit 309c292413
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
python3/vimspector/debug_session.py
View file

@ -171,6 +171,12 @@ class DebugSession( object ):
# working directory. # working directory.
'cwd': os.getcwd(), 'cwd': os.getcwd(),
} }
# Pretend that vars passed to the launch command were typed in by the user
# (they may have been in theory)
USER_CHOICES.update( launch_variables )
self._variables.update( launch_variables )
self._variables.update( self._variables.update(
utils.ParseVariables( adapter.get( 'variables', {} ), utils.ParseVariables( adapter.get( 'variables', {} ),
self._variables, self._variables,
@ -180,12 +186,6 @@ class DebugSession( object ):
self._variables, self._variables,
USER_CHOICES ) ) USER_CHOICES ) )
# Pretend that vars passed to the launch command were typed in by the user
# (they may have been in theory)
# TODO: Is it right that we do this _after_ ParseVariables, rather than
# before ?
USER_CHOICES.update( launch_variables )
self._variables.update( launch_variables )
utils.ExpandReferencesInDict( configuration, utils.ExpandReferencesInDict( configuration,
self._variables, self._variables,