2019-08-22 11:36:17 -04:00
|
|
|
" For older Vims without sign_place() the plugin has to manaage the sign ids.
|
2016-11-22 03:36:31 -05:00
|
|
|
let s:first_sign_id = 3000
|
|
|
|
let s:next_sign_id = s:first_sign_id
|
|
|
|
" Remove-all-signs optimisation requires Vim 7.3.596+.
|
|
|
|
let s:supports_star = v:version > 703 || (v:version == 703 && has("patch596"))
|
|
|
|
|
|
|
|
|
2018-03-31 10:56:26 -04:00
|
|
|
function! gitgutter#sign#enable() abort
|
|
|
|
let old_signs = g:gitgutter_signs
|
|
|
|
|
|
|
|
let g:gitgutter_signs = 1
|
|
|
|
call gitgutter#highlight#define_sign_text_highlights()
|
|
|
|
|
2019-11-16 10:28:42 -05:00
|
|
|
if !old_signs && !g:gitgutter_highlight_lines && !g:gitgutter_highlight_linenrs
|
2018-03-31 10:56:26 -04:00
|
|
|
call gitgutter#all(1)
|
|
|
|
endif
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
function! gitgutter#sign#disable() abort
|
|
|
|
let g:gitgutter_signs = 0
|
|
|
|
call gitgutter#highlight#define_sign_text_highlights()
|
|
|
|
|
2019-11-16 10:28:42 -05:00
|
|
|
if !g:gitgutter_highlight_lines && !g:gitgutter_highlight_linenrs
|
2018-03-31 10:56:26 -04:00
|
|
|
call gitgutter#sign#clear_signs(bufnr(''))
|
|
|
|
endif
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
function! gitgutter#sign#toggle() abort
|
|
|
|
if g:gitgutter_signs
|
|
|
|
call gitgutter#sign#disable()
|
|
|
|
else
|
|
|
|
call gitgutter#sign#enable()
|
|
|
|
endif
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
2019-08-22 11:36:17 -04:00
|
|
|
" Removes gitgutter's signs from the buffer being processed.
|
2018-03-31 10:56:26 -04:00
|
|
|
function! gitgutter#sign#clear_signs(bufnr) abort
|
2019-08-22 11:36:17 -04:00
|
|
|
if exists('*sign_unplace')
|
|
|
|
call sign_unplace('gitgutter', {'buffer': a:bufnr})
|
|
|
|
return
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
2018-03-31 10:56:26 -04:00
|
|
|
call s:find_current_signs(a:bufnr)
|
2016-11-22 03:36:31 -05:00
|
|
|
|
2018-03-31 10:56:26 -04:00
|
|
|
let sign_ids = map(values(gitgutter#utility#getbufvar(a:bufnr, 'gitgutter_signs')), 'v:val.id')
|
|
|
|
call s:remove_signs(a:bufnr, sign_ids, 1)
|
|
|
|
call gitgutter#utility#setbufvar(a:bufnr, 'gitgutter_signs', {})
|
2016-11-22 03:36:31 -05:00
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
" Updates gitgutter's signs in the buffer being processed.
|
|
|
|
"
|
|
|
|
" modified_lines: list of [<line_number (number)>, <name (string)>]
|
|
|
|
" where name = 'added|removed|modified|modified_removed'
|
2018-03-31 10:56:26 -04:00
|
|
|
function! gitgutter#sign#update_signs(bufnr, modified_lines) abort
|
2019-08-22 11:36:17 -04:00
|
|
|
if exists('*sign_unplace')
|
|
|
|
" Vim is (hopefully) now quick enough to remove all signs then place new ones.
|
|
|
|
call sign_unplace('gitgutter', {'buffer': a:bufnr})
|
|
|
|
|
|
|
|
let modified_lines = s:handle_double_hunk(a:modified_lines)
|
|
|
|
let signs = map(copy(modified_lines), '{'.
|
|
|
|
\ '"buffer": a:bufnr,'.
|
|
|
|
\ '"group": "gitgutter",'.
|
|
|
|
\ '"name": s:highlight_name_for_change(v:val[1]),'.
|
|
|
|
\ '"lnum": v:val[0],'.
|
|
|
|
\ '"priority": g:gitgutter_sign_priority'.
|
|
|
|
\ '}')
|
|
|
|
|
|
|
|
if exists('*sign_placelist')
|
|
|
|
call sign_placelist(signs)
|
|
|
|
return
|
|
|
|
endif
|
2016-11-22 03:36:31 -05:00
|
|
|
|
2019-08-22 11:36:17 -04:00
|
|
|
for sign in signs
|
|
|
|
call sign_place(0, sign.group, sign.name, sign.buffer, {'lnum': sign.lnum, 'priority': sign.priority})
|
|
|
|
endfor
|
|
|
|
return
|
2016-11-22 03:36:31 -05:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
2019-08-22 11:36:17 -04:00
|
|
|
" Derive a delta between the current signs and the ones we want.
|
|
|
|
" Remove signs from lines that no longer need a sign.
|
|
|
|
" Upsert the remaining signs.
|
2016-11-22 03:36:31 -05:00
|
|
|
|
2019-08-22 11:36:17 -04:00
|
|
|
call s:find_current_signs(a:bufnr)
|
2016-11-22 03:36:31 -05:00
|
|
|
|
2019-08-22 11:36:17 -04:00
|
|
|
let new_gitgutter_signs_line_numbers = map(copy(a:modified_lines), 'v:val[0]')
|
|
|
|
let obsolete_signs = s:obsolete_gitgutter_signs_to_remove(a:bufnr, new_gitgutter_signs_line_numbers)
|
2016-11-22 03:36:31 -05:00
|
|
|
|
2019-08-22 11:36:17 -04:00
|
|
|
call s:remove_signs(a:bufnr, obsolete_signs, s:remove_all_old_signs)
|
|
|
|
call s:upsert_new_gitgutter_signs(a:bufnr, a:modified_lines)
|
2016-11-22 03:36:31 -05:00
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
"
|
|
|
|
" Internal functions
|
|
|
|
"
|
|
|
|
|
|
|
|
|
2018-03-31 10:56:26 -04:00
|
|
|
function! s:find_current_signs(bufnr) abort
|
2016-11-22 03:36:31 -05:00
|
|
|
let gitgutter_signs = {} " <line_number (string)>: {'id': <id (number)>, 'name': <name (string)>}
|
2019-08-22 11:36:17 -04:00
|
|
|
if !g:gitgutter_sign_allow_clobber
|
|
|
|
let other_signs = [] " [<line_number (number),...]
|
|
|
|
endif
|
|
|
|
|
|
|
|
if exists('*getbufinfo')
|
|
|
|
let bufinfo = getbufinfo(a:bufnr)[0]
|
|
|
|
let signs = has_key(bufinfo, 'signs') ? bufinfo.signs : []
|
|
|
|
else
|
|
|
|
let signs = []
|
|
|
|
|
|
|
|
redir => signlines
|
|
|
|
silent execute "sign place buffer=" . a:bufnr
|
|
|
|
redir END
|
|
|
|
|
|
|
|
for signline in filter(split(signlines, '\n')[2:], 'v:val =~# "="')
|
|
|
|
" Typical sign line before v8.1.0614: line=88 id=1234 name=GitGutterLineAdded
|
|
|
|
" We assume splitting is faster than a regexp.
|
|
|
|
let components = split(signline)
|
|
|
|
call add(signs, {
|
|
|
|
\ 'lnum': str2nr(split(components[0], '=')[1]),
|
|
|
|
\ 'id': str2nr(split(components[1], '=')[1]),
|
|
|
|
\ 'name': split(components[2], '=')[1]
|
|
|
|
\ })
|
|
|
|
endfor
|
|
|
|
endif
|
|
|
|
|
|
|
|
for sign in signs
|
|
|
|
if sign.name =~# 'GitGutter'
|
|
|
|
" Remove orphaned signs (signs placed on lines which have been deleted).
|
|
|
|
" (When a line is deleted its sign lingers. Subsequent lines' signs'
|
|
|
|
" line numbers are decremented appropriately.)
|
|
|
|
if has_key(gitgutter_signs, sign.lnum)
|
|
|
|
execute "sign unplace" gitgutter_signs[sign.lnum].id
|
|
|
|
endif
|
|
|
|
let gitgutter_signs[sign.lnum] = {'id': sign.id, 'name': sign.name}
|
2016-11-22 03:36:31 -05:00
|
|
|
else
|
2019-08-22 11:36:17 -04:00
|
|
|
if !g:gitgutter_sign_allow_clobber
|
|
|
|
call add(other_signs, sign.lnum)
|
2016-11-22 03:36:31 -05:00
|
|
|
endif
|
2019-08-22 11:36:17 -04:00
|
|
|
endif
|
2016-11-22 03:36:31 -05:00
|
|
|
endfor
|
|
|
|
|
2018-03-31 10:56:26 -04:00
|
|
|
call gitgutter#utility#setbufvar(a:bufnr, 'gitgutter_signs', gitgutter_signs)
|
2019-08-22 11:36:17 -04:00
|
|
|
if !g:gitgutter_sign_allow_clobber
|
|
|
|
call gitgutter#utility#setbufvar(a:bufnr, 'other_signs', other_signs)
|
|
|
|
endif
|
2016-11-22 03:36:31 -05:00
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
" Returns a list of [<id (number)>, ...]
|
|
|
|
" Sets `s:remove_all_old_signs` as a side-effect.
|
2018-03-31 10:56:26 -04:00
|
|
|
function! s:obsolete_gitgutter_signs_to_remove(bufnr, new_gitgutter_signs_line_numbers) abort
|
2016-11-22 03:36:31 -05:00
|
|
|
let signs_to_remove = [] " list of [<id (number)>, ...]
|
|
|
|
let remove_all_signs = 1
|
2018-03-31 10:56:26 -04:00
|
|
|
let old_gitgutter_signs = gitgutter#utility#getbufvar(a:bufnr, 'gitgutter_signs')
|
2016-11-22 03:36:31 -05:00
|
|
|
for line_number in keys(old_gitgutter_signs)
|
|
|
|
if index(a:new_gitgutter_signs_line_numbers, str2nr(line_number)) == -1
|
|
|
|
call add(signs_to_remove, old_gitgutter_signs[line_number].id)
|
|
|
|
else
|
|
|
|
let remove_all_signs = 0
|
|
|
|
endif
|
|
|
|
endfor
|
|
|
|
let s:remove_all_old_signs = remove_all_signs
|
|
|
|
return signs_to_remove
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
2018-03-31 10:56:26 -04:00
|
|
|
function! s:remove_signs(bufnr, sign_ids, all_signs) abort
|
2019-08-22 11:36:17 -04:00
|
|
|
if a:all_signs && s:supports_star && (g:gitgutter_sign_allow_clobber || empty(gitgutter#utility#getbufvar(a:bufnr, 'other_signs')))
|
2018-03-31 10:56:26 -04:00
|
|
|
execute "sign unplace * buffer=" . a:bufnr
|
2016-11-22 03:36:31 -05:00
|
|
|
else
|
|
|
|
for id in a:sign_ids
|
|
|
|
execute "sign unplace" id
|
|
|
|
endfor
|
|
|
|
endif
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
2018-03-31 10:56:26 -04:00
|
|
|
function! s:upsert_new_gitgutter_signs(bufnr, modified_lines) abort
|
2019-08-22 11:36:17 -04:00
|
|
|
if !g:gitgutter_sign_allow_clobber
|
|
|
|
let other_signs = gitgutter#utility#getbufvar(a:bufnr, 'other_signs')
|
|
|
|
endif
|
2018-03-31 10:56:26 -04:00
|
|
|
let old_gitgutter_signs = gitgutter#utility#getbufvar(a:bufnr, 'gitgutter_signs')
|
2016-11-22 03:36:31 -05:00
|
|
|
|
2019-08-22 11:36:17 -04:00
|
|
|
let modified_lines = s:handle_double_hunk(a:modified_lines)
|
2018-11-01 06:03:42 -04:00
|
|
|
|
|
|
|
for line in modified_lines
|
2016-11-22 03:36:31 -05:00
|
|
|
let line_number = line[0] " <number>
|
2019-08-22 11:36:17 -04:00
|
|
|
if g:gitgutter_sign_allow_clobber || index(other_signs, line_number) == -1 " don't clobber others' signs
|
2018-03-31 10:56:26 -04:00
|
|
|
let name = s:highlight_name_for_change(line[1])
|
2016-11-22 03:36:31 -05:00
|
|
|
if !has_key(old_gitgutter_signs, line_number) " insert
|
2018-03-31 10:56:26 -04:00
|
|
|
let id = s:next_sign_id()
|
|
|
|
execute "sign place" id "line=" . line_number "name=" . name "buffer=" . a:bufnr
|
2016-11-22 03:36:31 -05:00
|
|
|
else " update if sign has changed
|
|
|
|
let old_sign = old_gitgutter_signs[line_number]
|
|
|
|
if old_sign.name !=# name
|
2018-03-31 10:56:26 -04:00
|
|
|
execute "sign place" old_sign.id "name=" . name "buffer=" . a:bufnr
|
2016-11-22 03:36:31 -05:00
|
|
|
end
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endfor
|
|
|
|
" At this point b:gitgutter_gitgutter_signs is out of date.
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
2019-08-22 11:36:17 -04:00
|
|
|
" Handle special case where the first line is the site of two hunks:
|
|
|
|
" lines deleted above at the start of the file, and lines deleted
|
|
|
|
" immediately below.
|
|
|
|
function! s:handle_double_hunk(modified_lines)
|
|
|
|
if a:modified_lines[0:1] == [[1, 'removed_first_line'], [1, 'removed']]
|
|
|
|
return [[1, 'removed_above_and_below']] + a:modified_lines[2:]
|
|
|
|
endif
|
|
|
|
|
|
|
|
return a:modified_lines
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
2018-03-31 10:56:26 -04:00
|
|
|
function! s:next_sign_id() abort
|
2016-11-22 03:36:31 -05:00
|
|
|
let next_id = s:next_sign_id
|
|
|
|
let s:next_sign_id += 1
|
|
|
|
return next_id
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
" Only for testing.
|
|
|
|
function! gitgutter#sign#reset()
|
|
|
|
let s:next_sign_id = s:first_sign_id
|
|
|
|
endfunction
|
2018-03-31 10:56:26 -04:00
|
|
|
|
|
|
|
|
|
|
|
function! s:highlight_name_for_change(text) abort
|
|
|
|
if a:text ==# 'added'
|
|
|
|
return 'GitGutterLineAdded'
|
|
|
|
elseif a:text ==# 'removed'
|
|
|
|
return 'GitGutterLineRemoved'
|
|
|
|
elseif a:text ==# 'removed_first_line'
|
|
|
|
return 'GitGutterLineRemovedFirstLine'
|
|
|
|
elseif a:text ==# 'modified'
|
|
|
|
return 'GitGutterLineModified'
|
|
|
|
elseif a:text ==# 'modified_removed'
|
|
|
|
return 'GitGutterLineModifiedRemoved'
|
2018-11-01 06:03:42 -04:00
|
|
|
elseif a:text ==# 'removed_above_and_below'
|
|
|
|
return 'GitGutterLineRemovedAboveAndBelow'
|
2018-03-31 10:56:26 -04:00
|
|
|
endif
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|