Updated plugins

sources_non_forked/vim-gitgutter/autoload/gitgutter/highlight.vim

@@ -4,7 +4,6 @@ function! gitgutter#highlight#line_disable() abort
 
   if !g:gitgutter_signs
     call gitgutter#sign#clear_signs(bufnr(''))
-    call gitgutter#sign#remove_dummy_sign(bufnr(''), 0)
   endif
 
   redraw!
@@ -31,6 +30,38 @@ function! gitgutter#highlight#line_toggle() abort
   endif
 endfunction
 
+function! gitgutter#highlight#linenr_disable() abort
+  let g:gitgutter_highlight_linenrs = 0
+  call s:define_sign_linenr_highlights()
+
+  if !g:gitgutter_signs
+    call gitgutter#sign#clear_signs(bufnr(''))
+  endif
+
+  redraw!
+endfunction
+
+function! gitgutter#highlight#linenr_enable() abort
+  let old_highlight_lines = g:gitgutter_highlight_linenrs
+
+  let g:gitgutter_highlight_linenrs = 1
+  call s:define_sign_linenr_highlights()
+
+  if !old_highlight_lines && !g:gitgutter_signs
+    call gitgutter#all(1)
+  endif
+
+  redraw!
+endfunction
+
+function! gitgutter#highlight#linenr_toggle() abort
+  if g:gitgutter_highlight_linenrs
+    call gitgutter#highlight#linenr_disable()
+  else
+    call gitgutter#highlight#linenr_enable()
+  endif
+endfunction
+
 
 function! gitgutter#highlight#define_sign_column_highlight() abort
   if g:gitgutter_override_sign_column_highlight
@@ -66,6 +97,11 @@ function! gitgutter#highlight#define_highlights() abort
   highlight default link GitGutterChangeLine       DiffChange
   highlight default link GitGutterDeleteLine       DiffDelete
   highlight default link GitGutterChangeDeleteLine GitGutterChangeLine
+
+  highlight default link GitGutterAddLineNr          CursorLineNr
+  highlight default link GitGutterChangeLineNr       CursorLineNr
+  highlight default link GitGutterDeleteLineNr       CursorLineNr
+  highlight default link GitGutterChangeDeleteLineNr CursorLineNr
 endfunction
 
 function! gitgutter#highlight#define_signs() abort
@@ -75,11 +111,11 @@ function! gitgutter#highlight#define_signs() abort
   sign define GitGutterLineRemovedFirstLine
   sign define GitGutterLineRemovedAboveAndBelow
   sign define GitGutterLineModifiedRemoved
-  sign define GitGutterDummy
 
   call s:define_sign_text()
   call gitgutter#highlight#define_sign_text_highlights()
   call s:define_sign_line_highlights()
+  call s:define_sign_linenr_highlights()
 endfunction
 
 function! s:define_sign_text() abort
@@ -131,40 +167,45 @@ function! s:define_sign_line_highlights() abort
   endif
 endfunction
 
-function! s:get_foreground_colors(group) abort
-  redir => highlight
-  silent execute 'silent highlight ' . a:group
-  redir END
-
-  let link_matches = matchlist(highlight, 'links to \(\S\+\)')
-  if len(link_matches) > 0 " follow the link
-    return s:get_foreground_colors(link_matches[1])
+function! s:define_sign_linenr_highlights() abort
+  if has('nvim-0.3.2')
+    try
+      if g:gitgutter_highlight_linenrs
+          sign define GitGutterLineAdded                 numhl=GitGutterAddLineNr
+          sign define GitGutterLineModified              numhl=GitGutterChangeLineNr
+          sign define GitGutterLineRemoved               numhl=GitGutterDeleteLineNr
+          sign define GitGutterLineRemovedFirstLine      numhl=GitGutterDeleteLineNr
+          sign define GitGutterLineRemovedAboveAndBelow  numhl=GitGutterDeleteLineNr
+          sign define GitGutterLineModifiedRemoved       numhl=GitGutterChangeDeleteLineNr
+      else
+        sign define GitGutterLineAdded                 numhl=
+        sign define GitGutterLineModified              numhl=
+        sign define GitGutterLineRemoved               numhl=
+        sign define GitGutterLineRemovedFirstLine      numhl=
+        sign define GitGutterLineRemovedAboveAndBelow  numhl=
+        sign define GitGutterLineModifiedRemoved       numhl=
+      endif
+    catch /E475/
+    endtry
   endif
+endfunction
 
-  let ctermfg = s:match_highlight(highlight, 'ctermfg=\([0-9A-Za-z]\+\)')
-  let guifg   = s:match_highlight(highlight, 'guifg=\([#0-9A-Za-z]\+\)')
+function! s:get_hl(group, what, mode) abort
+  let r = synIDattr(synIDtrans(hlID(a:group)), a:what, a:mode)
+  if empty(r) || r == -1
+    return 'NONE'
+  endif
+  return r
+endfunction
+
+function! s:get_foreground_colors(group) abort
+  let ctermfg = s:get_hl(a:group, 'fg', 'cterm')
+  let guifg = s:get_hl(a:group, 'fg', 'gui')
   return [guifg, ctermfg]
 endfunction
 
 function! s:get_background_colors(group) abort
-  redir => highlight
-  silent execute 'silent highlight ' . a:group
-  redir END
-
-  let link_matches = matchlist(highlight, 'links to \(\S\+\)')
-  if len(link_matches) > 0 " follow the link
-    return s:get_background_colors(link_matches[1])
-  endif
-
-  let ctermbg = s:match_highlight(highlight, 'ctermbg=\([0-9A-Za-z]\+\)')
-  let guibg   = s:match_highlight(highlight, 'guibg=\([#0-9A-Za-z]\+\)')
+  let ctermbg = s:get_hl(a:group, 'bg', 'cterm')
+  let guibg = s:get_hl(a:group, 'bg', 'gui')
   return [guibg, ctermbg]
 endfunction
-
-function! s:match_highlight(highlight, pattern) abort
-  let matches = matchlist(a:highlight, a:pattern)
-  if len(matches) == 0
-    return 'NONE'
-  endif
-  return matches[1]
-endfunction