mirror of
https://github.com/airblade/vim-gitgutter.git
synced 2025-11-08 19:43:47 -05:00
07d7c9d478
Most colorschemes (e.g. solarized) don't give any thought to the
SignColumn highlight group so generally the sign column is ugly.
With this change vim-gitgutter defaults to making the sign column look
like the line number column.
Solarized users no longer need `highlight clear SignColumn` in their
vimrc :)
To stop vim-gitgutter from overriding the SignColumn highlight, add this
to your vimrc:
let g:gitgutter_override_sign_column_highlight = 0
191 lines
6.0 KiB
VimL
191 lines
6.0 KiB
VimL
scriptencoding utf-8
|
|
|
|
if exists('g:loaded_gitgutter') || !executable('git') || !has('signs') || &cp
|
|
finish
|
|
endif
|
|
let g:loaded_gitgutter = 1
|
|
|
|
" Initialisation {{{
|
|
|
|
" Realtime sign updates require Vim 7.3.105+.
|
|
if v:version < 703 || (v:version == 703 && !has("patch105"))
|
|
let g:gitgutter_realtime = 0
|
|
endif
|
|
|
|
" Eager updates require gettabvar()/settabvar().
|
|
if !exists("*gettabvar")
|
|
let g:gitgutter_eager = 0
|
|
endif
|
|
|
|
function! s:set(var, default)
|
|
if !exists(a:var)
|
|
if type(a:default)
|
|
execute 'let' a:var '=' string(a:default)
|
|
else
|
|
execute 'let' a:var '=' a:default
|
|
endif
|
|
endif
|
|
endfunction
|
|
|
|
call s:set('g:gitgutter_enabled', 1)
|
|
call s:set('g:gitgutter_max_signs', 500)
|
|
call s:set('g:gitgutter_signs', 1)
|
|
call s:set('g:gitgutter_highlight_lines', 0)
|
|
call s:set('g:gitgutter_sign_column_always', 0)
|
|
call s:set('g:gitgutter_override_sign_column_highlight', 1)
|
|
call s:set('g:gitgutter_realtime', 1)
|
|
call s:set('g:gitgutter_eager', 1)
|
|
call s:set('g:gitgutter_sign_added', '+')
|
|
call s:set('g:gitgutter_sign_modified', '~')
|
|
call s:set('g:gitgutter_sign_removed', '_')
|
|
call s:set('g:gitgutter_sign_removed_first_line', '‾')
|
|
call s:set('g:gitgutter_sign_modified_removed', '~_')
|
|
call s:set('g:gitgutter_diff_args', '')
|
|
call s:set('g:gitgutter_escape_grep', 0)
|
|
call s:set('g:gitgutter_map_keys', 1)
|
|
call s:set('g:gitgutter_avoid_cmd_prompt_on_windows', 1)
|
|
|
|
call gitgutter#highlight#define_sign_column_highlight()
|
|
call gitgutter#highlight#define_highlights()
|
|
call gitgutter#highlight#define_signs()
|
|
|
|
" }}}
|
|
|
|
" Primary functions {{{
|
|
|
|
command GitGutterAll call gitgutter#all()
|
|
command GitGutter call gitgutter#process_buffer(bufnr(''), 0)
|
|
|
|
command GitGutterDisable call gitgutter#disable()
|
|
command GitGutterEnable call gitgutter#enable()
|
|
command GitGutterToggle call gitgutter#toggle()
|
|
|
|
" }}}
|
|
|
|
" Line highlights {{{
|
|
|
|
command GitGutterLineHighlightsDisable call gitgutter#line_highlights_disable()
|
|
command GitGutterLineHighlightsEnable call gitgutter#line_highlights_enable()
|
|
command GitGutterLineHighlightsToggle call gitgutter#line_highlights_toggle()
|
|
|
|
" }}}
|
|
|
|
" Signs {{{
|
|
|
|
command GitGutterSignsEnable call gitgutter#signs_enable()
|
|
command GitGutterSignsDisable call gitgutter#signs_disable()
|
|
command GitGutterSignsToggle call gitgutter#signs_toggle()
|
|
|
|
" }}}
|
|
|
|
" Hunks {{{
|
|
|
|
command -count=1 GitGutterNextHunk call gitgutter#hunk#next_hunk(<count>)
|
|
command -count=1 GitGutterPrevHunk call gitgutter#hunk#prev_hunk(<count>)
|
|
|
|
command GitGutterStageHunk call gitgutter#stage_hunk()
|
|
command GitGutterRevertHunk call gitgutter#revert_hunk()
|
|
command GitGutterPreviewHunk call gitgutter#preview_hunk()
|
|
|
|
" Returns the git-diff hunks for the file or an empty list if there
|
|
" aren't any hunks.
|
|
"
|
|
" The return value is a list of lists. There is one inner list per hunk.
|
|
"
|
|
" [
|
|
" [from_line, from_count, to_line, to_count],
|
|
" [from_line, from_count, to_line, to_count],
|
|
" ...
|
|
" ]
|
|
"
|
|
" where:
|
|
"
|
|
" `from` - refers to the staged file
|
|
" `to` - refers to the working tree's file
|
|
" `line` - refers to the line number where the change starts
|
|
" `count` - refers to the number of lines the change covers
|
|
function! GitGutterGetHunks()
|
|
return gitgutter#utility#is_active() ? gitgutter#hunk#hunks() : []
|
|
endfunction
|
|
|
|
" Returns an array that contains a summary of the current hunk status.
|
|
" The format is [ added, modified, removed ], where each value represents
|
|
" the number of lines added/modified/removed respectively.
|
|
function! GitGutterGetHunkSummary()
|
|
return gitgutter#hunk#summary()
|
|
endfunction
|
|
|
|
" }}}
|
|
|
|
command GitGutterDebug call gitgutter#debug#debug()
|
|
|
|
" Maps {{{
|
|
|
|
nnoremap <silent> <expr> <Plug>GitGutterNextHunk &diff ? ']c' : ":\<C-U>execute v:count1 . 'GitGutterNextHunk'\<CR>"
|
|
nnoremap <silent> <expr> <Plug>GitGutterPrevHunk &diff ? '[c' : ":\<C-U>execute v:count1 . 'GitGutterPrevHunk'\<CR>"
|
|
|
|
if g:gitgutter_map_keys
|
|
if !hasmapto('<Plug>GitGutterPrevHunk') && maparg('[c', 'n') ==# ''
|
|
nmap [c <Plug>GitGutterPrevHunk
|
|
endif
|
|
if !hasmapto('<Plug>GitGutterNextHunk') && maparg(']c', 'n') ==# ''
|
|
nmap ]c <Plug>GitGutterNextHunk
|
|
endif
|
|
endif
|
|
|
|
|
|
nnoremap <silent> <Plug>GitGutterStageHunk :GitGutterStageHunk<CR>
|
|
nnoremap <silent> <Plug>GitGutterRevertHunk :GitGutterRevertHunk<CR>
|
|
nnoremap <silent> <Plug>GitGutterPreviewHunk :GitGutterPreviewHunk<CR>
|
|
|
|
if g:gitgutter_map_keys
|
|
if !hasmapto('<Plug>GitGutterStageHunk') && maparg('<Leader>hs', 'n') ==# ''
|
|
nmap <Leader>hs <Plug>GitGutterStageHunk
|
|
endif
|
|
if !hasmapto('<Plug>GitGutterRevertHunk') && maparg('<Leader>hr', 'n') ==# ''
|
|
nmap <Leader>hr <Plug>GitGutterRevertHunk
|
|
endif
|
|
if !hasmapto('<Plug>GitGutterPreviewHunk') && maparg('<Leader>hp', 'n') ==# ''
|
|
nmap <Leader>hp <Plug>GitGutterPreviewHunk
|
|
endif
|
|
endif
|
|
|
|
" }}}
|
|
|
|
" Autocommands {{{
|
|
|
|
augroup gitgutter
|
|
autocmd!
|
|
|
|
if g:gitgutter_realtime
|
|
autocmd CursorHold,CursorHoldI * call gitgutter#process_buffer(bufnr(''), 1)
|
|
endif
|
|
|
|
if g:gitgutter_eager
|
|
autocmd BufEnter,BufWritePost,FileChangedShellPost *
|
|
\ if gettabvar(tabpagenr(), 'gitgutter_didtabenter') |
|
|
\ call settabvar(tabpagenr(), 'gitgutter_didtabenter', 0) |
|
|
\ else |
|
|
\ call gitgutter#process_buffer(bufnr(''), 0) |
|
|
\ endif
|
|
autocmd TabEnter *
|
|
\ call settabvar(tabpagenr(), 'gitgutter_didtabenter', 1) |
|
|
\ call gitgutter#all()
|
|
if !has('gui_win32')
|
|
autocmd FocusGained * call gitgutter#all()
|
|
endif
|
|
else
|
|
autocmd BufRead,BufWritePost,FileChangedShellPost * call gitgutter#process_buffer(bufnr(''), 0)
|
|
endif
|
|
|
|
autocmd ColorScheme * call gitgutter#highlight#define_sign_column_highlight() | call gitgutter#highlight#define_highlights()
|
|
|
|
" Disable during :vimgrep
|
|
autocmd QuickFixCmdPre *vimgrep* let g:gitgutter_enabled = 0
|
|
autocmd QuickFixCmdPost *vimgrep* let g:gitgutter_enabled = 1
|
|
augroup END
|
|
|
|
" }}}
|
|
|
|
" vim:set et sw=2 fdm=marker:
|