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

Make Restart and Stop work properly (and together)

Browse source
This commit is contained in:
Ben Jackson 2020-07-11 15:11:39 +01:00
commit 8d2ea44cb9
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
python3/vimspector/debug_session.py
View file

@ -62,11 +62,13 @@ class DebugSession( object ):
self._run_on_server_exit = None self._run_on_server_exit = None
self._configuration = None
self._adapter = None
self._ResetServerState() self._ResetServerState()
def _ResetServerState( self ): def _ResetServerState( self ):
self._connection = None self._connection = None
self._configuration = None
self._init_complete = False self._init_complete = False
self._launch_complete = False self._launch_complete = False
self._on_init_complete_handlers = [] self._on_init_complete_handlers = []
@ -278,11 +280,7 @@ class DebugSession( object ):
start() start()
def Restart( self ): def Restart( self ):
# TODO: There is a restart message but isn't always supported. if self._configuration is None or self._adapter is None:
# FIXME: For some reason this doesn't work when run from the WinBar. It just
# beeps and doesn't display the config selector. One option is to just not
# display the selector and restart with the same opitons.
if not self._configuration or not self._adapter:
return self.Start() return self.Start()
self._StartWithConfiguration( self._configuration, self._adapter ) self._StartWithConfiguration( self._configuration, self._adapter )
@ -294,7 +292,8 @@ class DebugSession( object ):
if not self._connection: if not self._connection:
utils.UserMessage( utils.UserMessage(
'Vimspector not connected, start a debug session first', 'Vimspector not connected, start a debug session first',
persist=True, error=True ) persist=True,
error=True )
return return
return fct( self, *args, **kwargs ) return fct( self, *args, **kwargs )
return wrapper return wrapper
@ -595,6 +594,9 @@ class DebugSession( object ):
"Shutting down debug adapter..." ) "Shutting down debug adapter..." )
def handler( *args ): def handler( *args ):
self._splash_screen = utils.HideSplash( self._api_prefix,
self._splash_screen )
if callback: if callback:
self._logger.debug( "Setting server exit handler before disconnect" ) self._logger.debug( "Setting server exit handler before disconnect" )
assert not self._run_on_server_exit assert not self._run_on_server_exit