Merge pull request mhinz#361 from KapJI/fix-signs

Cover more cases in hunk processing to display signs

Author: jamessan

autoload/sy/highlight.vim

@@ -7,10 +7,12 @@ if get(g:, 'signify_sign_show_text', 1)
   let s:sign_add               = get(g:, 'signify_sign_add',               '+')
   let s:sign_delete_first_line = get(g:, 'signify_sign_delete_first_line', '‾')
   let s:sign_change            = get(g:, 'signify_sign_change',            '!')
+  let s:sign_change_delete     = get(g:, 'signify_sign_change_delete', s:sign_change . s:sign_delete_first_line)
 else
   let s:sign_add               = ' '
   let s:sign_delete_first_line = ' '
   let s:sign_change            = ' '
+  let s:sign_change_delete     = ' '
 endif
 
 let s:sign_show_count = get(g:, 'signify_sign_show_count', 1)
@@ -22,17 +24,20 @@ function! sy#highlight#setup() abort
   highlight default link SignifyLineDelete          DiffDelete
   highlight default link SignifyLineDeleteFirstLine SignifyLineDelete
   highlight default link SignifyLineChange          DiffChange
+  highlight default link SignifyLineChangeDelete    SignifyLineChange
 
   highlight default link SignifySignAdd             DiffAdd
   highlight default link SignifySignDelete          DiffDelete
   highlight default link SignifySignDeleteFirstLine SignifySignDelete
   highlight default link SignifySignChange          DiffChange
+  highlight default link SignifySignChangeDelete    SignifySignChange
 endfunction
 
 " #line_enable {{{1
 function! sy#highlight#line_enable() abort
   execute 'sign define SignifyAdd text='. s:sign_add 'texthl=SignifySignAdd linehl=SignifyLineAdd'
   execute 'sign define SignifyChange text='. s:sign_change 'texthl=SignifySignChange linehl=SignifyLineChange'
+  execute 'sign define SignifyChangeDelete text='. s:sign_change_delete 'texthl=SignifySignChangeDelete linehl=SignifyLineChangeDelete'
   execute 'sign define SignifyRemoveFirstLine text='. s:sign_delete_first_line 'texthl=SignifySignDeleteFirstLine linehl=SignifyLineDeleteFirstLine'
   let g:signify_line_highlight = 1
 endfunction
@@ -41,6 +46,7 @@ endfunction
 function! sy#highlight#line_disable() abort
   execute 'sign define SignifyAdd text='. s:sign_add 'texthl=SignifySignAdd linehl='
   execute 'sign define SignifyChange text='. s:sign_change 'texthl=SignifySignChange linehl='
+  execute 'sign define SignifyChangeDelete text='. s:sign_change_delete 'texthl=SignifySignChangeDelete linehl='
   execute 'sign define SignifyRemoveFirstLine text='. s:sign_delete_first_line 'texthl=SignifySignDeleteFirstLine linehl='
   let g:signify_line_highlight = 0
 endfunction

autoload/sy/sign.vim

@@ -82,7 +82,7 @@ function! sy#sign#process_diff(sy, vcs, diff) abort
     " @@ -5,0 +6,2 @@ this is line 5
     " +this is line 5
     " +this is line 5
-    if (old_count == 0) && (new_count >= 1)
+    if old_count == 0 && new_count > 0
       let added += new_count
       let offset = 0
       while offset < new_count
@@ -97,7 +97,7 @@ function! sy#sign#process_diff(sy, vcs, diff) abort
     " @@ -6,2 +5,0 @@ this is line 5
     " -this is line 6
     " -this is line 7
-    elseif (old_count >= 1) && (new_count == 0)
+    elseif old_count > 0 && new_count == 0
       if s:external_sign_present(a:sy, new_line) | continue | endif
       let deleted += old_count
       if new_line == 0
@@ -111,22 +111,63 @@ function! sy#sign#process_diff(sy, vcs, diff) abort
       else
         call add(ids, s:add_sign(a:sy, new_line, 'SignifyDeleteMore', s:sign_delete))
       endif
-
-    " There are additions and deletions, however we don't know which lines are
-    " 'changed' and which are new so we just show the whole block as changed.
-    "
-    " With sufficiently smart heuristics we could see which lines are the most
-    " dissimilar to the previous lines and mark them as additions but for now
-    " we will not do that.
-    else
-      let modified += old_count
-      let offset    = 0
+    " All lines are modified.
+    elseif old_count > 0 && new_count > 0 && old_count == new_count
+      let modified += new_count
+      let offset = 0
       while offset < new_count
         let line    = new_line + offset
         let offset += 1
         if s:external_sign_present(a:sy, line) | continue | endif
         call add(ids, s:add_sign(a:sy, line, 'SignifyChange'))
       endwhile
+    " Some lines are modified and some new lines are added.
+    elseif old_count > 0 && new_count > 0 && old_count < new_count
+      let modified += old_count
+      let added += new_count - old_count
+      let offset = 0
+      while offset < old_count
+        let line    = new_line + offset
+        let offset += 1
+        if s:external_sign_present(a:sy, line) | continue | endif
+        call add(ids, s:add_sign(a:sy, line, 'SignifyChange'))
+      endwhile
+      while offset < new_count
+        let line    = new_line + offset
+        let offset += 1
+        if s:external_sign_present(a:sy, line) | continue | endif
+        call add(ids, s:add_sign(a:sy, line, 'SignifyAdd'))
+      endwhile
+    " Some lines are modified and some lines are deleted.
+    elseif old_count > 0 && new_count > 0 && old_count > new_count
+      let modified += new_count
+      let deleted_count = old_count - new_count
+      let deleted += deleted_count
+
+      let prev_line_available = new_line > 1 && !get(a:sy.signtable, new_line - 1, 0)
+      if prev_line_available
+        if s:sign_show_count
+          let text = s:sign_delete . (deleted_count <= 99 ? deleted_count : '>')
+          while strwidth(text) > 2
+            let text = substitute(text, '.', '', '')
+          endwhile
+          call add(ids, s:add_sign(a:sy, new_line - 1, 'SignifyDelete'. deleted_count, text))
+        else
+          call add(ids, s:add_sign(a:sy, new_line - 1, 'SignifyDeleteMore', s:sign_delete))
+        endif
+      endif
+
+      let offset = 0
+      while offset < new_count
+        let line    = new_line + offset
+        if s:external_sign_present(a:sy, line) | continue | endif
+        if !prev_line_available && offset == 0
+          call add(ids, s:add_sign(a:sy, line, 'SignifyChangeDelete'))
+        else
+          call add(ids, s:add_sign(a:sy, line, 'SignifyChange'))
+        endif
+        let offset += 1
+      endwhile
     endif
 
     if !empty(ids)

doc/signify.txt

@@ -131,6 +131,7 @@ default values, as long as no "Default:" section is given.
     |g:signify_sign_delete|
     |g:signify_sign_delete_first_line|
     |g:signify_sign_change|
+    |g:signify_sign_change_delete|
     |g:signify_sign_show_count|
     |g:signify_sign_show_text|
     |g:signify_difftool|
@@ -267,11 +268,13 @@ Enable line highlighting in addition to using signs by default.
                                               *g:signify_sign_delete*
                                               *g:signify_sign_delete_first_line*
                                               *g:signify_sign_change*
+                                              *g:signify_sign_change_delete*
 >
     let g:signify_sign_add               = '+'
     let g:signify_sign_delete            = '_'
     let g:signify_sign_delete_first_line = '‾'
     let g:signify_sign_change            = '!'
+    let g:signify_sign_change_delete     = g:signify_sign_change . g:signify_sign_delete_first_line
 <
 The sign to use if a line was added, deleted or changed or a combination of
 these.
@@ -548,11 +551,13 @@ highlighting groups: |hl-DiffAdd|, |hl-DiffChange|, |hl-DiffDelete|:
 >
     highlight link SignifyLineAdd             DiffAdd
     highlight link SignifyLineChange          DiffChange
+    highlight link SignifyLineChangeDelete    SignifyLineChange
     highlight link SignifyLineDelete          DiffDelete
     highlight link SignifyLineDeleteFirstLine SignifyLineDelete
 
     highlight link SignifySignAdd             DiffAdd
     highlight link SignifySignChange          DiffChange
+    highlight link SignifySignChangeDelete    SignifySignChange
     highlight link SignifySignDelete          DiffDelete
     highlight link SignifySignDeleteFirstLine SignifySignDelete
 <