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

If signs are moved by user actions, use the current lnum of the sign for the breakpoint.

Browse source
This commit is contained in:
Ben Jackson 2019-12-14 15:51:04 +00:00
commit 16c3b65cae
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
python3/vimspector/breakpoints.py
View file

@ -87,6 +87,7 @@ class ProjectBreakpoints( object ):
else: else:
for file_name, breakpoints in self._line_breakpoints.items(): for file_name, breakpoints in self._line_breakpoints.items():
for bp in breakpoints: for bp in breakpoints:
self._SignToLine( file_name, bp )
qf.append( { qf.append( {
'filename': file_name, 'filename': file_name,
'lnum': bp[ 'line' ], 'lnum': bp[ 'line' ],
@ -113,6 +114,7 @@ class ProjectBreakpoints( object ):
# These are the user-entered breakpoints. # These are the user-entered breakpoints.
for file_name, breakpoints in self._line_breakpoints.items(): for file_name, breakpoints in self._line_breakpoints.items():
for bp in breakpoints: for bp in breakpoints:
self._SignToLine( file_name, bp )
if 'sign_id' in bp: if 'sign_id' in bp:
vim.command( 'sign unplace {0} group=VimspectorBP'.format( vim.command( 'sign unplace {0} group=VimspectorBP'.format(
bp[ 'sign_id' ] ) ) bp[ 'sign_id' ] ) )
@ -132,6 +134,7 @@ class ProjectBreakpoints( object ):
found_bp = False found_bp = False
action = 'New' action = 'New'
for index, bp in enumerate( self._line_breakpoints[ file_name ] ): for index, bp in enumerate( self._line_breakpoints[ file_name ] ):
self._SignToLine( file_name, bp )
if bp[ 'line' ] == line: if bp[ 'line' ] == line:
found_bp = True found_bp = True
if bp[ 'state' ] == 'ENABLED' and not self._connection: if bp[ 'state' ] == 'ENABLED' and not self._connection:
@ -143,7 +146,7 @@ class ProjectBreakpoints( object ):
bp[ 'sign_id' ] ) ) bp[ 'sign_id' ] ) )
del self._line_breakpoints[ file_name ][ index ] del self._line_breakpoints[ file_name ][ index ]
action = 'Delete' action = 'Delete'
break break
self._logger.debug( "Toggle found bp at {}:{} ? {} ({})".format( self._logger.debug( "Toggle found bp at {}:{} ? {} ({})".format(
file_name, file_name,
@ -215,6 +218,7 @@ class ProjectBreakpoints( object ):
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:
self._SignToLine( file_name, bp )
if 'sign_id' in bp: if 'sign_id' in bp:
vim.command( 'sign unplace {0} group=VimspectorBP'.format( vim.command( 'sign unplace {0} group=VimspectorBP'.format(
bp[ 'sign_id' ] ) ) bp[ 'sign_id' ] ) )
@ -330,6 +334,7 @@ class ProjectBreakpoints( object ):
def _ShowBreakpoints( self ): def _ShowBreakpoints( self ):
for file_name, line_breakpoints in self._line_breakpoints.items(): for file_name, line_breakpoints in self._line_breakpoints.items():
for bp in line_breakpoints: for bp in line_breakpoints:
self._SignToLine( file_name, bp )
if 'sign_id' in bp: if 'sign_id' in bp:
vim.command( 'sign unplace {0} group=VimspectorBP '.format( vim.command( 'sign unplace {0} group=VimspectorBP '.format(
bp[ 'sign_id' ] ) ) bp[ 'sign_id' ] ) )
@ -344,3 +349,17 @@ class ProjectBreakpoints( object ):
'vimspectorBP' if bp[ 'state' ] == 'ENABLED' 'vimspectorBP' if bp[ 'state' ] == 'ENABLED'
else 'vimspectorBPDisabled', else 'vimspectorBPDisabled',
file_name ) ) file_name ) )
def _SignToLine( self, file_name, bp ):
if 'sign_id' not in bp:
return bp[ 'line' ]
signs = vim.eval( "sign_getplaced( '{}', {} )".format(
utils.Escape( file_name ),
json.dumps( { 'id': file_name, 'group': 'VimspectorBP', } ) ) )
if len( signs ) == 1 and len( signs[ 0 ][ 'signs' ] ) == 1:
bp[ 'line' ] = int( signs[ 0 ][ 'signs' ][ 0 ][ 'lnum' ] )
return bp[ 'line' ]