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

Marginally improve the hover text

Browse source 
Don't use the default padded display.
When the request fails, say why.
Include the type if known.
This commit is contained in:
Ben Jackson 2018-06-03 21:43:45 +01:00
commit 88ac7f6d55
3 changed files with 37 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
autoload/vimspector/internal/balloon.vim
View file

@ -25,7 +25,7 @@ function vimspector#internal#balloon#BalloonExpr()
" int() because for *no good reason* winnr is a string. " int() because for *no good reason* winnr is a string.
py3 _vimspector_session.ShowBalloon( int( vim.eval( 'v:beval_winnr' ) ) + 1, py3 _vimspector_session.ShowBalloon( int( vim.eval( 'v:beval_winnr' ) ) + 1,
\ vim.eval( 'v:beval_text' ) ) \ vim.eval( 'v:beval_text' ) )
return '' return '...'
endfunction endfunction
" Boilerplate {{{ " Boilerplate {{{

26
python3/vimspector/debug_adapter_connection.py
View file

@ -16,8 +16,13 @@
import logging import logging
import json import json
from collections import namedtuple
from vimspector import utils from vimspector import utils
PendingRequest = namedtuple( 'PendingRequest',
[ 'msg', 'handler', 'failure_handler' ] )
class DebugAdapterConnection( object ): class DebugAdapterConnection( object ):
def __init__( self, handler, send_func ): def __init__( self, handler, send_func ):
@ -29,16 +34,18 @@ class DebugAdapterConnection( object ):
self._buffer = bytes() self._buffer = bytes()
self._handler = handler self._handler = handler
self._next_message_id = 0 self._next_message_id = 0
self._outstanding_requests = dict() self._outstanding_requests = {}
def DoRequest( self, handler, msg ): def DoRequest( self, handler, msg, failure_handler=None ):
this_id = self._next_message_id this_id = self._next_message_id
self._next_message_id += 1 self._next_message_id += 1
msg[ 'seq' ] = this_id msg[ 'seq' ] = this_id
msg[ 'type' ] = 'request' msg[ 'type' ] = 'request'
self._outstanding_requests[ this_id ] = handler self._outstanding_requests[ this_id ] = PendingRequest( msg,
handler,
failure_handler )
self._SendMessage( msg ) self._SendMessage( msg )
def Reset( self ): def Reset( self ):
@ -132,11 +139,11 @@ class DebugAdapterConnection( object ):
return return
if message[ 'type' ] == 'response': if message[ 'type' ] == 'response':
handler = self._outstanding_requests.pop( message[ 'request_seq' ] ) request = self._outstanding_requests.pop( message[ 'request_seq' ] )
if message[ 'success' ]: if message[ 'success' ]:
if handler: if request.handler:
handler( message ) request.handler( message )
else: else:
reason = message.get( 'message' ) reason = message.get( 'message' )
if not message: if not message:
@ -148,9 +155,10 @@ class DebugAdapterConnection( object ):
message = 'No reason' message = 'No reason'
self._logger.error( 'Request failed: {0}'.format( reason ) ) self._logger.error( 'Request failed: {0}'.format( reason ) )
utils.UserMessage( 'Request failed: {0}'.format( reason ) ) if request.failure_handler:
request.failure_handler( reason, message )
else:
utils.UserMessage( 'Request failed: {0}'.format( reason ) )
elif message[ 'type' ] == 'event': elif message[ 'type' ] == 'event':
method = 'OnEvent_' + message[ 'event' ] method = 'OnEvent_' + message[ 'event' ]
if method in dir( self._handler ): if method in dir( self._handler ):

24
python3/vimspector/variables.py
View file

@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
import vim import vim
import json
from collections import namedtuple from collections import namedtuple
from functools import partial from functools import partial
@ -92,8 +93,6 @@ class VariablesView( object ):
for k, v in self._oldoptions.items(): for k, v in self._oldoptions.items():
vim.options[ k ] = v vim.options[ k ] = v
# TODO: delete the buffer?
def LoadScopes( self, frame ): def LoadScopes( self, frame ):
def scopes_consumer( message ): def scopes_consumer( message ):
self._scopes = [] self._scopes = []
@ -273,8 +272,23 @@ class VariablesView( object ):
return return
def handler( message ): def handler( message ):
vim.eval( "balloon_show( '{0}' )".format( # TODO: this result count be expandable, but we have no way to allow the
utils.Escape( message[ 'body' ][ 'result' ] ) ) ) # user to interact with the balloon to expand it.
body = message[ 'body' ]
ref = body.get( 'variablesReference', 0 )
icon = '+ ' if ref > 0 else ''
display = [
'Type: ' + body.get( 'type', '<unknown>' ),
icon + 'Value: ' + body[ 'result' ]
]
vim.eval( "balloon_show( {0} )".format(
json.dumps( display ) ) )
def failure_handler( reason, message ):
display = [ reason ]
vim.eval( "balloon_show( {0} )".format(
json.dumps( display ) ) )
self._connection.DoRequest( handler, { self._connection.DoRequest( handler, {
'command': 'evaluate', 'command': 'evaluate',
@ -283,4 +297,4 @@ class VariablesView( object ):
'frameId': frame[ 'id' ], 'frameId': frame[ 'id' ],
'context': 'hover', 'context': 'hover',
} }
} ) }, failure_handler )