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

Merge pull request #244 from puremourning/sign-pri

Browse source 
Highlight the current line using linehl=CursorLine
This commit is contained in:
mergify[bot] 2020-09-01 16:22:48 +00:00 • committed by GitHub
commit e81be848a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 177 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -1370,7 +1370,7 @@ define them in your `vimrc`.
| `vimspectorBP` | Line breakpoint | 9 |
| `vimspectorBPCond` | Conditional line breakpiont | 9 |
| `vimspectorBPDisabled` | Disabled breakpoint | 9 |
| `vimspectorPC` | Program counter (i.e. current line) | 20 |
| `vimspectorPC` | Program counter (i.e. current line) | 200 |
The default symbols are the equivalent of something like the following:
@ -1378,7 +1378,7 @@ The default symbols are the equivalent of something like the following:
sign define vimspectorBP text=\ ● texthl=WarningMsg
sign define vimspectorBPCond text=\ ◆ texthl=WarningMsg
sign define vimspectorBPDisabled text=\ ● texthl=LineNr
sign define vimspectorPC text=\ ▶ texthl=MatchParen
sign define vimspectorPC text=\ ▶ texthl=MatchParen linehl=CursorLine
```
If the signs don't display properly, your font probably doesn't contain these

1
python3/vimspector/breakpoints.py
View file

@ -383,7 +383,6 @@ class ProjectBreakpoints( object ):
signs.PlaceSign( bp[ 'sign_id' ],
'VimspectorBP',
sign,
9,
file_name,
bp[ 'line' ] )

11
python3/vimspector/code.py
View file

@ -53,7 +53,8 @@ class CodeView( object ):
if not signs.SignDefined( 'vimspectorPC' ):
signs.DefineSign( 'vimspectorPC',
text = '▶',
texthl = 'MatchParen' )
texthl = 'MatchParen',
linehl = 'CursorLine' )
def SetCurrentFrame( self, frame ):
@ -78,7 +79,6 @@ class CodeView( object ):
signs.PlaceSign( self._signs[ 'vimspectorPC' ],
'VimspectorCode',
'vimspectorPC',
20,
frame[ 'source' ][ 'path' ],
frame[ 'line' ] )
except vim.error as e:
@ -184,7 +184,6 @@ class CodeView( object ):
'VimspectorCode',
'vimspectorBP' if breakpoint[ 'verified' ]
else 'vimspectorBPDisabled',
9,
file_name,
breakpoint[ 'line' ] )
@ -248,9 +247,9 @@ class CodeView( object ):
if term_options[ 'vertical' ] and not term_options.get( 'curwin', 0 ):
term_options[ 'term_cols' ] = max(
min ( int( vim.eval( 'winwidth( 0 )' ) )
- settings.Int( 'code_minwidth', 82 ),
settings.Int( 'terminal_maxwidth', 80 ) ),
settings.Int( 'terminal_minwidth' , 10 )
- settings.Int( 'code_minwidth' ),
settings.Int( 'terminal_maxwidth' ) ),
settings.Int( 'terminal_minwidth' )
)
buffer_number = int(

8
python3/vimspector/debug_session.py
View file

@ -510,7 +510,7 @@ class DebugSession( object ):
# TODO: The UI code is too scattered. Re-organise into a UI class that
# just deals with these thigns like window layout and custmisattion.
vim.command( f'botright { settings.Int( "bottombar_height", 10 ) }new' )
vim.command( f'botright { settings.Int( "bottombar_height" ) }new' )
win = vim.current.window
self._logView = output.OutputView( win, self._api_prefix )
self._logView.AddLogFileView()
@ -525,7 +525,7 @@ class DebugSession( object ):
# and poking into each View class to check its window is valid also feels
# wrong.
with utils.LetCurrentTabpage( self._uiTab ):
vim.command( f'botright { settings.Int( "bottombar_height", 10 ) }new' )
vim.command( f'botright { settings.Int( "bottombar_height" ) }new' )
self._outputView.UseWindow( vim.current.window )
vim.vars[ 'vimspector_session_windows' ][ 'output' ] = utils.WindowID(
vim.current.window,
@ -568,7 +568,7 @@ class DebugSession( object ):
# Call stack
vim.command(
f'topleft vertical { settings.Int( "sidebar_width", 50 ) }new' )
f'topleft vertical { settings.Int( "sidebar_width" ) }new' )
stack_trace_window = vim.current.window
one_third = int( vim.eval( 'winheight( 0 )' ) ) / 3
self._stackTraceView = stack_trace.StackTraceView( self,
@ -594,7 +594,7 @@ class DebugSession( object ):
# Output/logging
vim.current.window = code_window
vim.command( f'rightbelow { settings.Int( "bottombar_height", 10 ) }new' )
vim.command( f'rightbelow { settings.Int( "bottombar_height" ) }new' )
output_window = vim.current.window
self._outputView = output.DAPOutputView( output_window,
self._api_prefix )

2
python3/vimspector/installer.py
View file

@ -114,7 +114,7 @@ def RunInstaller( api_prefix, leave_open, *args, **kwargs ):
_ResetInstaller()
with utils.RestoreCurrentWindow():
vim.command( f'botright { settings.Int( "bottombar_height", 10 ) }new' )
vim.command( f'botright { settings.Int( "bottombar_height" ) }new' )
win = vim.current.window
OUTPUT_VIEW = output.OutputView( win, api_prefix )

54
python3/vimspector/settings.py
View file

@ -18,22 +18,58 @@ import vim
import builtins
from vimspector import utils
DEFAULTS = {
# UI
'bottombar_height': 10,
'sidebar_width': 50,
'code_minwidth': 82,
'terminal_maxwidth': 80,
'terminal_minwidth': 10,
# Signs
'sign_priority': {
'vimspectorPC': 200,
'vimspectorBP': 9,
'vimspectorBPCond': 9,
'vimspectorBPDisabled': 9,
},
# Installer
'install_gadgets': [],
}
def Get( option: str, default=None, cls=str ):
return cls( utils.GetVimValue( vim.vars,
f'vimspector_{ option }',
default ) )
DEFAULTS.get( option, cls() ) ) )
def Int( option: str, default=0 ):
return Get( option, default=default, cls=builtins.int )
def Int( option: str ):
return Get( option, cls=builtins.int )
def List( option: str, default=[] ):
return utils.GetVimList( vim.vars, f'vimspector_{ option }', default )
def List( option: str ):
return utils.GetVimList( vim.vars,
f'vimspector_{ option }',
DEFAULTS.get( option, [] ) )
def Dict( option: str, default={} ):
return utils.GetVimValue( vim.vars,
f'vimspector_{ option }',
default )
# FIXME:
# In Vim, we must use vim.Dictionary because this sorts out the annoying
# keys-as-bytes discrepancy, making things awkward. That said, we still have the
# problem where the _values_ are potentially bytes. It's very tempting to just
# make a deep copy to antive str type here.
# Of course in neovim, it's totally different and you actually get a dict type
# back (though for once, neovim is making life somewhat easier for a change).
DICT_TYPE = dict
if hasattr( vim, 'Dictionary' ):
DICT_TYPE = vim.Dictionary
def Dict( option: str ):
d = DICT_TYPE( DEFAULTS.get( option, {} ) )
d.update( utils.GetVimValue( vim.vars,
f'vimspector_{ option }',
{} ) )
return d

12
python3/vimspector/signs.py
View file

@ -12,18 +12,22 @@ def SignDefined( name ):
return False
def DefineSign( name, text, texthl, col = 'right' ):
def DefineSign( name, text, texthl, col = 'right', **kwargs ):
if col == 'right':
if int( utils.Call( 'strdisplaywidth', text ) ) < 2:
text = ' ' + text
text = text.replace( ' ', r'\ ' )
vim.command( f'sign define { name } text={ text } texthl={ texthl }' )
cmd = f'sign define { name } text={ text } texthl={ texthl }'
for key, value in kwargs.items():
cmd += f' { key }={ value }'
vim.command( cmd )
def PlaceSign( sign_id, group, name, priority, file, line ):
priority = settings.Dict( 'sign_priority' ).get( name, priority )
def PlaceSign( sign_id, group, name, file, line ):
priority = settings.Dict( 'sign_priority' )[ name ]
cmd = ( f'sign place { sign_id } '
f'group={ group } '

1
python3/vimspector/utils.py
View file

@ -749,7 +749,6 @@ def GetVimList( vim_dict, name, default=None ):
return [ i.decode( 'utf-8' ) if isinstance( i, bytes ) else i for i in value ]
def GetVimspectorBase():
return GetVimValue( vim.vars,
'vimspector_base_dir',

90
tests/breakpoints.test.vim
View file

@ -631,8 +631,92 @@ function! Test_Custom_Breakpoint_Priority()
call vimspector#test#setup#Reset()
lcd -
%bwipeout!
endfunction
function! TearDown_Test_Custom_Breakpoint_Priority()
unlet! g:vimspector_sign_priority
endfunction
function! Test_Custom_Breakpoint_Priority_Partial()
let g:vimspector_sign_priority = {
\ 'vimspectorBP': 2,
\ 'vimspectorBPCond': 3,
\ 'vimspectorBPDisabled': 4
\ }
" While not debugging
lcd testdata/cpp/simple
edit simple.cpp
call setpos( '.', [ 0, 15, 1 ] )
call vimspector#ToggleBreakpoint()
call vimspector#test#signs#AssertSignGroupSingletonAtLine( 'VimspectorBP',
\ 15,
\ 'vimspectorBP',
\ 2 )
call setpos( '.', [ 0, 16, 1 ] )
call vimspector#ToggleBreakpoint()
call vimspector#ToggleBreakpoint()
call vimspector#test#signs#AssertSignGroupSingletonAtLine(
\ 'VimspectorBP',
\ 16,
\ 'vimspectorBPDisabled',
\ 4 )
call vimspector#ToggleBreakpoint()
call vimspector#test#signs#AssertSignGroupEmptyAtLine( 'VimspectorBP', 15 )
call setpos( '.', [ 0, 17, 1 ] )
call vimspector#ToggleBreakpoint( { 'condition': '1' } )
call vimspector#test#signs#AssertSignGroupSingletonAtLine(
\ 'VimspectorBP',
\ 17,
\ 'vimspectorBPCond',
\ 3 )
" While debugging
call vimspector#Launch()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( 'simple.cpp', 15, 1 )
call vimspector#test#signs#AssertPCIsAtLineInBuffer( 'simple.cpp', 15 )
call vimspector#test#signs#AssertSignAtLine(
\ 'VimspectorCode',
\ 15,
\ 'vimspectorBP',
\ 2 )
call vimspector#test#signs#AssertSignAtLine(
\ 'VimspectorCode',
\ 15,
\ 'vimspectorPC',
\ 200 )
call vimspector#test#signs#AssertSignGroupSingletonAtLine( 'VimspectorCode',
\ 17,
\ 'vimspectorBP',
\ 2 )
call vimspector#StepOver()
" No sign as disabled
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( 'simple.cpp', 16, 1 )
call vimspector#test#signs#AssertPCIsAtLineInBuffer( 'simple.cpp', 16 )
call vimspector#StepOver()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( 'simple.cpp', 17, 1 )
call vimspector#test#signs#AssertPCIsAtLineInBuffer( 'simple.cpp', 17 )
call vimspector#test#signs#AssertSignGroupSingletonAtLine(
\ 'VimspectorCode',
\ 15,
\ 'vimspectorBP',
\ 2 )
call vimspector#test#signs#AssertSignAtLine(
\ 'VimspectorCode',
\ 17,
\ 'vimspectorBP',
\ 2 )
call vimspector#test#signs#AssertSignAtLine(
\ 'VimspectorCode',
\ 17,
\ 'vimspectorPC',
\ 200 )
call vimspector#test#setup#Reset()
lcd -
%bwipeout!
unlet! g:vimspector_sign_priority
endfunction

29
tests/tabpage.test.vim
View file

@ -71,7 +71,12 @@ function! Test_All_Buffers_Deleted_NoHidden()
let buffers_after = getbufinfo( opts )
call assert_equal( len( buffers_before ), len( buffers_after ) )
if assert_equal( len( buffers_before ), len( buffers_after ) )
call assert_report( 'Expected '
\ . string( buffers_before )
\ . ' but found '
\ . string( buffers_after ) )
endif
set hidden&
lcd -
@ -101,7 +106,12 @@ function! Test_All_Buffers_Deleted_Hidden()
let buffers_after = getbufinfo( opts )
call assert_equal( len( buffers_before ), len( buffers_after ) )
if assert_equal( len( buffers_before ), len( buffers_after ) )
call assert_report( 'Expected '
\ . string( buffers_before )
\ . ' but found '
\ . string( buffers_after ) )
endif
set hidden&
lcd -
@ -115,7 +125,13 @@ function! Test_All_Buffers_Deleted_ToggleLog()
VimspectorToggleLog
VimspectorToggleLog
let buffers_after = getbufinfo( #{ buflisted: 1 } )
call assert_equal( len( buffers_before ), len( buffers_after ) )
if assert_equal( len( buffers_before ), len( buffers_after ) )
call assert_report( 'Expected '
\ . string( buffers_before )
\ . ' but found '
\ . string( buffers_after ) )
endif
call vimspector#test#setup#Reset()
set hidden&
@ -142,7 +158,12 @@ function! Test_All_Buffers_Deleted_Installer()
\ 120000 )
let buffers_after = getbufinfo( #{ buflisted: 1 } )
call assert_equal( len( buffers_before ), len( buffers_after ) )
if assert_equal( len( buffers_before ), len( buffers_after ) )
call assert_report( 'Expected '
\ . string( buffers_before )
\ . ' but found '
\ . string( buffers_after ) )
endif
call vimspector#test#setup#Reset()
set hidden&