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

Fix breakpoints

Browse source
This commit is contained in:
Ben Jackson 2019-02-24 19:41:41 +00:00
commit 8528d80510
2 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
python3/vimspector/breakpoints.py
View file

@ -16,7 +16,7 @@
from collections import defaultdict from collections import defaultdict
import vim import vim
import functools import os
class ProjectBreakpoints( object ): class ProjectBreakpoints( object ):
@ -27,6 +27,9 @@ class ProjectBreakpoints( object ):
self._line_breakpoints = defaultdict( list ) self._line_breakpoints = defaultdict( list )
self._func_breakpoints = [] self._func_breakpoints = []
# FIXME: Remove this. Remove breakpoints nonesense from code.py
self._breakpoints_handler = None
self._next_sign_id = 1 self._next_sign_id = 1
# TODO: Change to sign_define ? # TODO: Change to sign_define ?
@ -127,7 +130,17 @@ class ProjectBreakpoints( object ):
else: else:
self._ShowBreakpoints() self._ShowBreakpoints()
def SendBreakpoints( self, handler ):
# FIXME: Remove this temporary compat .layer
def SetBreakpointsHandler( self, handler ):
self._breakpoints_handler = handler
def SendBreakpoints( self ):
if not self._breakpoints_handler:
handler = lambda source, msg: self._ShowBreakpoints()
else:
handler = self._breakpoints_handler
for file_name, line_breakpoints in self._line_breakpoints.items(): for file_name, line_breakpoints in self._line_breakpoints.items():
breakpoints = [] breakpoints = []
for bp in line_breakpoints: for bp in line_breakpoints:
@ -147,7 +160,7 @@ class ProjectBreakpoints( object ):
} }
self._connection.DoRequest( self._connection.DoRequest(
functools.partial( self._UpdateBreakpoints, source ), lambda msg: handler( source, msg ),
{ {
'command': 'setBreakpoints', 'command': 'setBreakpoints',
'arguments': { 'arguments': {
@ -159,7 +172,7 @@ class ProjectBreakpoints( object ):
) )
self._connection.DoRequest( self._connection.DoRequest(
functools.partial( self._UpdateBreakpoints, None ), lambda msg: handler( None, msg ),
{ {
'command': 'setFunctionBreakpoints', 'command': 'setFunctionBreakpoints',
'arguments': { 'arguments': {

21
python3/vimspector/debug_session.py
View file

@ -147,6 +147,16 @@ class DebugSession( object ):
self._stackTraceView.ConnectionUp( self._connection ) self._stackTraceView.ConnectionUp( self._connection )
self._variablesView.ConnectionUp( self._connection ) self._variablesView.ConnectionUp( self._connection )
self._outputView.ConnectionUp( self._connection ) self._outputView.ConnectionUp( self._connection )
self._breakpoints.ConnectionUp( self._connection )
def update_breakpoints( source, message ):
if 'body' not in message:
return
self._codeView.AddBreakpoints( source,
message[ 'body' ][ 'breakpoints' ] )
self._codeView.ShowBreakpoints()
self._breakpoints.SetBreakpointsHandler( update_breakpoints )
if self._connection: if self._connection:
self._StopDebugAdapter( start ) self._StopDebugAdapter( start )
@ -539,15 +549,8 @@ class DebugSession( object ):
self._stackTraceView.LoadThreads( True ) self._stackTraceView.LoadThreads( True )
def OnEvent_initialized( self, message ): def OnEvent_initialized( self, message ):
def update_breakpoints( source, message ):
if 'body' not in message:
return
self._codeView.AddBreakpoints( source,
message[ 'body' ][ 'breakpoints' ] )
self._codeView.ShowBreakpoints()
self._codeView.ClearBreakpoints() self._codeView.ClearBreakpoints()
self._breakpoints.SendBreakpoints( update_breakpoints ) self._breakpoints.SendBreakpoints()
self._connection.DoRequest( self._connection.DoRequest(
lambda msg: self._OnInitializeComplete(), lambda msg: self._OnInitializeComplete(),
@ -614,6 +617,8 @@ class DebugSession( object ):
self._stackTraceView.ConnectionClosed() self._stackTraceView.ConnectionClosed()
self._variablesView.ConnectionClosed() self._variablesView.ConnectionClosed()
self._outputView.ConnectionClosed() self._outputView.ConnectionClosed()
self._breakpoints.ConnectionClosed()
self._breakpoints.SetBreakpointsHandler( None )
self._ResetServerState() self._ResetServerState()