mirror of
https://github.com/airblade/vim-gitgutter.git
synced 2025-11-09 03:53:47 -05:00
Replace custom function with built-in get() function
This commit is contained in:
@@ -14,16 +14,6 @@ endif
|
|||||||
|
|
||||||
let s:nomodeline = (v:version > 703 || (v:version == 703 && has('patch442'))) ? '<nomodeline>' : ''
|
let s:nomodeline = (v:version > 703 || (v:version == 703 && has('patch442'))) ? '<nomodeline>' : ''
|
||||||
|
|
||||||
function! s:set(var, default) abort
|
|
||||||
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
|
|
||||||
|
|
||||||
function! s:obsolete(var)
|
function! s:obsolete(var)
|
||||||
if exists(a:var)
|
if exists(a:var)
|
||||||
call gitgutter#utility#warn(a:var.' is obsolete and has no effect.')
|
call gitgutter#utility#warn(a:var.' is obsolete and has no effect.')
|
||||||
@@ -31,54 +21,54 @@ function! s:obsolete(var)
|
|||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
|
||||||
call s:set('g:gitgutter_preview_win_location', 'bo')
|
let g:gitgutter_preview_win_location = get(g:, 'gitgutter_preview_win_location', 'bo')
|
||||||
if exists('*nvim_open_win')
|
if exists('*nvim_open_win')
|
||||||
call s:set('g:gitgutter_preview_win_floating', 1)
|
let g:gitgutter_preview_win_floating = get(g:, 'gitgutter_preview_win_floating', 1)
|
||||||
else
|
else
|
||||||
call s:set('g:gitgutter_preview_win_floating', 0)
|
let g:gitgutter_preview_win_floating = get(g:, 'gitgutter_preview_win_floating', 0)
|
||||||
endif
|
endif
|
||||||
call s:set('g:gitgutter_enabled', 1)
|
let g:gitgutter_enabled = get(g:, 'gitgutter_enabled', 1)
|
||||||
if exists('*sign_unplace')
|
if exists('*sign_unplace')
|
||||||
call s:set('g:gitgutter_max_signs', -1)
|
let g:gitgutter_max_signs = get(g:, 'gitgutter_max_signs', -1)
|
||||||
else
|
else
|
||||||
call s:set('g:gitgutter_max_signs', 500)
|
let g:gitgutter_max_signs = get(g:, 'gitgutter_max_signs', 500)
|
||||||
endif
|
endif
|
||||||
call s:set('g:gitgutter_signs', 1)
|
let g:gitgutter_signs = get(g:, 'gitgutter_signs', 1)
|
||||||
call s:set('g:gitgutter_highlight_lines', 0)
|
let g:gitgutter_highlight_lines = get(g:, 'gitgutter_highlight_lines', 0)
|
||||||
call s:set('g:gitgutter_highlight_linenrs', 0)
|
let g:gitgutter_highlight_linenrs = get(g:, 'gitgutter_highlight_linenrs', 0)
|
||||||
call s:set('g:gitgutter_sign_priority', 10)
|
let g:gitgutter_sign_priority = get(g:, 'gitgutter_sign_priority', 10)
|
||||||
" Nvim 0.4.0 has an expanding sign column
|
" Nvim 0.4.0 has an expanding sign column
|
||||||
" The sign_place() function supports sign priority.
|
" The sign_place() function supports sign priority.
|
||||||
if (has('nvim-0.4.0') || exists('*sign_place')) && !exists('g:gitgutter_sign_allow_clobber')
|
if (has('nvim-0.4.0') || exists('*sign_place')) && !exists('g:gitgutter_sign_allow_clobber')
|
||||||
let g:gitgutter_sign_allow_clobber = 1
|
let g:gitgutter_sign_allow_clobber = 1
|
||||||
endif
|
endif
|
||||||
call s:set('g:gitgutter_sign_allow_clobber', 0)
|
let g:gitgutter_sign_allow_clobber = get(g:, 'gitgutter_sign_allow_clobber', 0)
|
||||||
call s:set('g:gitgutter_set_sign_backgrounds', 0)
|
let g:gitgutter_set_sign_backgrounds = get(g:, 'gitgutter_set_sign_backgrounds', 0)
|
||||||
call s:set('g:gitgutter_sign_added', '+')
|
let g:gitgutter_sign_added = get(g:, 'gitgutter_sign_added', '+')
|
||||||
call s:set('g:gitgutter_sign_modified', '~')
|
let g:gitgutter_sign_modified = get(g:, 'gitgutter_sign_modified', '~')
|
||||||
call s:set('g:gitgutter_sign_removed', '_')
|
let g:gitgutter_sign_removed = get(g:, 'gitgutter_sign_removed', '_')
|
||||||
|
|
||||||
if gitgutter#utility#supports_overscore_sign()
|
if gitgutter#utility#supports_overscore_sign()
|
||||||
call s:set('g:gitgutter_sign_removed_first_line', '‾')
|
let g:gitgutter_sign_removed_first_line = get(g:, 'gitgutter_sign_removed_first_line', '‾')
|
||||||
else
|
else
|
||||||
call s:set('g:gitgutter_sign_removed_first_line', '_^')
|
let g:gitgutter_sign_removed_first_line = get(g:, 'gitgutter_sign_removed_first_line', '_^')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
call s:set('g:gitgutter_sign_removed_above_and_below', '_¯')
|
let g:gitgutter_sign_removed_above_and_below = get(g:, 'gitgutter_sign_removed_above_and_below', '_¯')
|
||||||
call s:set('g:gitgutter_sign_modified_removed', '~_')
|
let g:gitgutter_sign_modified_removed = get(g:, 'gitgutter_sign_modified_removed', '~_')
|
||||||
call s:set('g:gitgutter_git_args', '')
|
let g:gitgutter_git_args = get(g:, 'gitgutter_git_args', '')
|
||||||
call s:set('g:gitgutter_diff_relative_to', 'index')
|
let g:gitgutter_diff_relative_to = get(g:, 'gitgutter_diff_relative_to', 'index')
|
||||||
call s:set('g:gitgutter_diff_args', '')
|
let g:gitgutter_diff_args = get(g:, 'gitgutter_diff_args', '')
|
||||||
call s:set('g:gitgutter_diff_base', '')
|
let g:gitgutter_diff_base = get(g:, 'gitgutter_diff_base', '')
|
||||||
call s:set('g:gitgutter_map_keys', 1)
|
let g:gitgutter_map_keys = get(g:, 'gitgutter_map_keys', 1)
|
||||||
call s:set('g:gitgutter_terminal_reports_focus', 1)
|
let g:gitgutter_terminal_reports_focus = get(g:, 'gitgutter_terminal_reports_focus', 1)
|
||||||
call s:set('g:gitgutter_async', 1)
|
let g:gitgutter_async = get(g:, 'gitgutter_async', 1)
|
||||||
call s:set('g:gitgutter_log', 0)
|
let g:gitgutter_log = get(g:, 'gitgutter_log', 0)
|
||||||
call s:set('g:gitgutter_use_location_list', 0)
|
let g:gitgutter_use_location_list = get(g:, 'gitgutter_use_location_list', 0)
|
||||||
call s:set('g:gitgutter_close_preview_on_escape', 0)
|
let g:gitgutter_close_preview_on_escape = get(g:, 'gitgutter_close_preview_on_escape', 0)
|
||||||
call s:set('g:gitgutter_show_msg_on_hunk_jumping', 1)
|
let g:gitgutter_show_msg_on_hunk_jumping = get(g:, 'gitgutter_show_msg_on_hunk_jumping', 1)
|
||||||
|
|
||||||
call s:set('g:gitgutter_git_executable', 'git')
|
let g:gitgutter_git_executable = get(g:, 'gitgutter_git_executable', 'git')
|
||||||
if !executable(g:gitgutter_git_executable)
|
if !executable(g:gitgutter_git_executable)
|
||||||
if g:gitgutter_enabled
|
if g:gitgutter_enabled
|
||||||
call gitgutter#utility#warn('cannot find git. Please set g:gitgutter_git_executable.')
|
call gitgutter#utility#warn('cannot find git. Please set g:gitgutter_git_executable.')
|
||||||
@@ -87,7 +77,7 @@ if !executable(g:gitgutter_git_executable)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
let default_grep = 'grep'
|
let default_grep = 'grep'
|
||||||
call s:set('g:gitgutter_grep', default_grep)
|
let g:gitgutter_grep = get(g:, 'gitgutter_grep', default_grep)
|
||||||
if !empty(g:gitgutter_grep)
|
if !empty(g:gitgutter_grep)
|
||||||
if executable(split(g:gitgutter_grep)[0])
|
if executable(split(g:gitgutter_grep)[0])
|
||||||
if $GREP_OPTIONS =~# '--color=always'
|
if $GREP_OPTIONS =~# '--color=always'
|
||||||
|
|||||||
Reference in New Issue
Block a user