Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only unplace own signs #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Only unplace own signs #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions autoload/coverage.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,18 @@ endif

"{{{ coverage utility functions

" Using a single sign id seems to be fine, as long as we unset it multiple
" times again.
" It is better than using the line numbers (conflicts), and easier than
" managing multiple ids, which is not necessary with on/off mode only.
let s:sign_id = 8923

""
" Places the signs at given {lines} in given {state}.
function! s:ColorSigns(lines, state) abort
for l:num in a:lines
execute ':sign place ' . l:num . ' line=' . l:num .
\ ' name=sign_' . a:state . ' file=' . expand('%')
execute ':sign place ' . s:sign_id . ' line=' . l:num .
\ ' name=coverage_' . a:state . ' file=' . expand('%')
endfor
endfunction

Expand All @@ -53,7 +59,7 @@ function! s:DefineHighlighting() abort
\ ' ctermfg=' . s:plugin.Flag(l:state . '_ctermfg') .
\ ' guibg=' . s:plugin.Flag(l:state . '_guibg') .
\ ' guifg=' . s:plugin.Flag(l:state . '_guifg')
execute 'sign define sign_' . l:state . ' text=' .
execute 'sign define coverage_' . l:state . ' text=' .
\ s:plugin.Flag(l:state . '_text') . ' texthl=coverage_' . l:state
endfor
endif
Expand Down Expand Up @@ -85,7 +91,19 @@ endfunction
" Hides coverage layer.
function! s:CoverageHide() abort
if has_key(s:visible, expand('%:p'))
execute 'sign unplace * file=' . expand('%:p')
" Unplace our signs for the current file.
let fname = bufname('%')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Helpers for programmatically listing and unplacing signs would be great to have in maktaba (see google/vim-maktaba#142). Consider splitting them out as standalone helper functions so they're easier to migrate over.

let signs = split(maktaba#command#GetOutput('sign place file=' . fname), '\n')

for s in signs
let cols = split(s)
let name = split(cols[-1], '=')[-1]
if name[0:8] ==# 'coverage_'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use maktaba#string#StartsWith(l:name, 'coverage_') vs. hard-coded indexes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I think this it is not necessare to use a helper method in this case, but was not aware of it.

let id = split(cols[-2], '=')[-1]
let id = s:sign_id
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is id here immediately overwritten?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch.. will have to look into it.

exe printf('sign unplace %d file=%s', id, fname)
endif
endfor
unlet s:visible[expand('%:p')]
endif
endfunction
Expand Down