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

Enable syntax highlighting for watches and locals

Browse source
This commit is contained in:
Ben Jackson 2019-12-15 10:12:19 +00:00
commit ed6beff03b
4 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
python3/vimspector/code.py
View file

@ -27,6 +27,7 @@ class CodeView( object ):
self._terminal_window = None self._terminal_window = None
self._terminal_buffer_number = None self._terminal_buffer_number = None
self.current_syntax = None
self._logger = logging.getLogger( __name__ ) self._logger = logging.getLogger( __name__ )
utils.SetUpLogging( self._logger ) utils.SetUpLogging( self._logger )
@ -93,6 +94,9 @@ class CodeView( object ):
frame[ 'line' ], frame[ 'line' ],
frame[ 'source' ][ 'path' ] ) ) frame[ 'source' ][ 'path' ] ) )
self.current_syntax = utils.ToUnicode(
vim.current.buffer.options[ 'syntax' ] )
return True return True
def Clear( self ): def Clear( self ):
@ -102,6 +106,7 @@ class CodeView( object ):
self._signs[ 'vimspectorPC' ] = None self._signs[ 'vimspectorPC' ] = None
self._UndisplaySigns() self._UndisplaySigns()
self.current_syntax = None
def Reset( self ): def Reset( self ):
self.ClearBreakpoints() self.ClearBreakpoints()

1
python3/vimspector/debug_session.py
View file

@ -427,6 +427,7 @@ class DebugSession( object ):
return False return False
if frame: if frame:
self._variablesView.SetSyntax( self._codeView.current_syntax )
self._variablesView.LoadScopes( frame ) self._variablesView.LoadScopes( frame )
self._variablesView.EvaluateWatches() self._variablesView.EvaluateWatches()
else: else:

6
python3/vimspector/utils.py
View file

@ -434,3 +434,9 @@ def GetBufferFilepath( buf ):
return '' return ''
return os.path.normpath( buf.name ) return os.path.normpath( buf.name )
def ToUnicode( b ):
if isinstance( b, bytes ):
return b.decode( 'utf-8' )
return b

18
python3/vimspector/variables.py
View file

@ -31,6 +31,7 @@ class VariablesView( object ):
self._vars = View( variables_win, {}, self._DrawScopes ) self._vars = View( variables_win, {}, self._DrawScopes )
self._watch = View( watches_win, {}, self._DrawWatches ) self._watch = View( watches_win, {}, self._DrawWatches )
self._connection = connection self._connection = connection
self._current_syntax = ''
# Allows us to hit <CR> to expand/collapse variables # Allows us to hit <CR> to expand/collapse variables
with utils.LetCurrentWindow( self._vars.win ): with utils.LetCurrentWindow( self._vars.win ):
@ -91,6 +92,7 @@ class VariablesView( object ):
utils.ClearBuffer( self._vars.win.buffer ) utils.ClearBuffer( self._vars.win.buffer )
with utils.ModifiableScratchBuffer( self._watch.win.buffer ): with utils.ModifiableScratchBuffer( self._watch.win.buffer ):
utils.ClearBuffer( self._watch.win.buffer ) utils.ClearBuffer( self._watch.win.buffer )
self._current_syntax = ''
def ConnectionUp( self, connection ): def ConnectionUp( self, connection ):
self._connection = connection self._connection = connection
@ -373,3 +375,19 @@ class VariablesView( object ):
'context': 'hover', 'context': 'hover',
} }
}, failure_handler ) }, failure_handler )
def SetSyntax( self, syntax ):
if not syntax:
syntax = ''
if self._current_syntax == syntax:
return
self._current_syntax = syntax
with utils.LetCurrentWindow( self._vars.win ):
vim.command( 'set syntax={}'.format( utils.Escape( syntax ) ) )
with utils.LetCurrentWindow( self._watch.win ):
vim.command( 'set syntax={}'.format( utils.Escape( syntax ) ) )