Skip to content

Commit

Permalink
add bm#is_bookmark_has_annotation_by_line() to check whether a bookma…
Browse files Browse the repository at this point in the history
…rk has an annotation

add g:bookmark_show_toggle_warning to show warning in toggle a annotated bookmark
confirm to remove a bookmark with annotation when g:bookmark_show_toggle_warning = 1
  • Loading branch information
yuan- committed Sep 15, 2015
1 parent 20403b5 commit 36be95e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
4 changes: 4 additions & 0 deletions autoload/bm.vim
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ function! bm#get_bookmark_by_line(file, line_nr)
return g:line_map[a:file][a:line_nr]
endfunction

function! bm#is_bookmark_has_annotation_by_line(file, line_nr)
return g:line_map[a:file][a:line_nr]['annotation'] !=# ""
endfunction

function! bm#get_bookmark_by_sign(file, sign_idx)
let line_nr = g:sign_map[a:file][a:sign_idx]
return bm#get_bookmark_by_line(a:file, line_nr)
Expand Down
8 changes: 8 additions & 0 deletions plugin/bookmark.vim
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ call s:set('g:bookmark_highlight_lines', 0 )
call s:set('g:bookmark_sign', '')
call s:set('g:bookmark_annotation_sign', '')
call s:set('g:bookmark_show_warning', 1 )
call s:set('g:bookmark_show_toggle_warning', 1 )
call s:set('g:bookmark_save_per_working_dir', 0 )
call s:set('g:bookmark_auto_save', 1 )
call s:set('g:bookmark_manage_per_buffer', 0 )
Expand Down Expand Up @@ -57,6 +58,13 @@ function! BookmarkToggle()
endif
let current_line = line('.')
if bm#has_bookmark_at_line(file, current_line)
if g:bookmark_show_toggle_warning ==# 1 && bm#is_bookmark_has_annotation_by_line(file, current_line)
let delete = confirm("Delete Annotated bookmarks?", "&Yes\n&No", 2)
if (delete !=# 1)
echo "Ignore!"
return
endif
endif
call s:bookmark_remove(file, current_line)
echo "Bookmark removed"
else
Expand Down

0 comments on commit 36be95e

Please sign in to comment.