minor refactoring

Author: mpetrov

plugin/diffstat.vim

@@ -27,77 +27,70 @@ function! s:DisplayBuffer()
   nnoremap  <script> <buffer> <silent> <cr> :call g:DiffStatOpenFile()<cr>
 endfunction
 
-function! DiffStatShortenPath(path, max_path_length)
-  let path = strlen(a:path) < a:max_path_length ? a:path : pathshorten(a:path)
+function! s:DiffStatShortenPath(path, max_path_length)
+  " Hardcode some googly patterns for now
+  let path = substitute(a:path, 'java/com/google', 'j/c/g', '')
+  let path = substitute(a:path, 'javatests/com/google', 'jt/c/g', '')
+
+  let path = strlen(path) < a:max_path_length ? path : pathshorten(a:path)
   if a:max_path_length < strlen(path)
     return '...' . matchstr(path, '\v.{0,'. (a:max_path_length - 3) . '}$')
   endif
   return path
 endfunction
 
-function! s:DiffStatPaddedString(string, num, before)
-  if a:before
-    return a:string . repeat(' ', a:num - len(a:string))
-  else
-    return repeat(' ', a:num - len(a:string)) . a:string
-  end
-endfunction
-
 function! s:DiffStatCommand(command)
-  let max_path_length = 54
-  let max_deltas_length = 18
+  let max_path_length = 56
+  let max_deltas_length = 16
 
-  let toplevel = split(system(g:diff_stat_git_command . " rev-parse --show-toplevel"), "\n")[0]
-  let command_result = 
+  let toplevel = split(system(
+        \ g:diff_stat_git_command . " rev-parse --show-toplevel"), "\n")[0]
+  let command_result =
 	\ system(g:diff_stat_git_command . " diff " . a:command . " --numstat")
 
   let files_list = {}
-  let deltas = []
+  let max_delta = 0
   let file_name_lengths = []
 
   for diff_line in split(command_result, "\n")
     let [inserts, deletes, name] =
-	  \ matchlist(diff_line, '\v\s*([0-9\-]+)\s+([0-9-]+)\s+(.+)')[1:3]
+	\ matchlist(diff_line, '\v\s*([0-9\-]+)\s+([0-9-]+)\s+(.+)')[1:3]
     let absolute_path =  toplevel . '/' . name
     let relative_path = fnamemodify(absolute_path, ':.')
-    let display_path_name = DiffStatShortenPath(relative_path, max_path_length)
+    let display_path_name = s:DiffStatShortenPath(relative_path, max_path_length)
     let files_list[display_path_name] =
-	  \ {'inserts': inserts, 'deletes': deletes, 'name': relative_path}
-    call add(deltas, inserts + deletes)
+	\ {'inserts': inserts, 'deletes': deletes, 'name': relative_path}
+    let max_delta = max([max_delta, inserts + deletes])
     let s:diff_files_list[display_path_name] = relative_path
     call add(file_name_lengths, strlen(display_path_name))
   endfor
 
-  let max_delta = max(deltas)
   let max_deltas_length = min([max_delta, max_deltas_length])
   let longest_filename = max(file_name_lengths)
-  unlet deltas
   unlet file_name_lengths
 
   for [key, value] in items(files_list)
+    let deltas_string = ''
     if value['inserts'] ==# '-' || value['deletes'] ==# '-'
       let total = 'Bin'
-      let files_list[key]['deltas'] = ''
     else
       let total = value['inserts'] + value['deletes']
       let inserts_count = max([value['inserts'] * max_deltas_length / max_delta,
-	    \ value['inserts'] + 0 > 0 ? 1 : 0])
+	\ value['inserts'] + 0 > 0 ? 1 : 0])
       let deletes_count = max([value['deletes'] * max_deltas_length / max_delta,
-	    \ value['deletes'] + 0 > 0 ? 1 : 0])
-      let files_list[key]['deltas'] =
-	    \ repeat('+',  inserts_count) . repeat('-',  deletes_count)
+	\ value['deletes'] + 0 > 0 ? 1 : 0])
+      let deltas_string =
+	\  ' ' . repeat('+',  inserts_count) . repeat('-',  deletes_count)
     endif
-    let files_list[key]['string'] = s:DiffStatPaddedString(key, max_path_length, 1)
-	  \ . ' | ' . s:DiffStatPaddedString(total, 3, 0) . ' ' . files_list[key]['deltas']
+
     let files_list[key]['string'] =
-          \ substitute(files_list[key]['string'], '\v\s+$', '', '')
+          \ printf('% -' . max_path_length . 's | % 4s%s',
+          \ key, total, deltas_string)
   endfor
   return files_list
 endfunction
 
-
 function DiffStatCallSystem(commit)
-  " TODO(mpetrov): consider using diff-tree or --numstat
   let text = "# git diff " . a:commit . "\n"
   let result = s:DiffStatCommand(a:commit)
   for [key, value] in items(result)
@@ -107,7 +100,7 @@ function DiffStatCallSystem(commit)
 endfunction
 
 let s:DiffStatRegex = '\v^\s*(\S+)\s*\|\s*\d+\s*[+-]+\s*$'
-function! s:DiffStatFileNameForLine(lnum) 
+function! s:DiffStatFileNameForLine(lnum)
    if getline(a:lnum) =~? s:DiffStatRegex
      return matchlist(getline(a:lnum), s:DiffStatRegex)[1]
    endif