added vim dir

5 files changed, 882 insertions, 0 deletions

diff --git a/vim/.vim/plugged/vim-gitgutter/test/cp932.txt b/vim/.vim/plugged/vim-gitgutter/test/cp932.txt
new file mode 100644
index 0000000..80cb10b
--- /dev/null
+++ b/vim/.vim/plugged/vim-gitgutter/test/cp932.txt
@@ -0,0 +1,8 @@
+The quick brown fox jumps
+over the lazy dog
+
+いろはにほへとちりぬるを
+わかよたれそつねならむ
+うゐのおくやまけふこえて
+あさきゆめみしゑひもせす
+
diff --git a/vim/.vim/plugged/vim-gitgutter/test/fixture.txt b/vim/.vim/plugged/vim-gitgutter/test/fixture.txt
new file mode 100644
index 0000000..f5c6aff
--- /dev/null
+++ b/vim/.vim/plugged/vim-gitgutter/test/fixture.txt
@@ -0,0 +1,11 @@
+a
+b
+c
+d
+e
+f
+g
+h
+i
+j
+
diff --git a/vim/.vim/plugged/vim-gitgutter/test/runner.vim b/vim/.vim/plugged/vim-gitgutter/test/runner.vim
new file mode 100644
index 0000000..630693c
--- /dev/null
+++ b/vim/.vim/plugged/vim-gitgutter/test/runner.vim
@@ -0,0 +1,162 @@
+"
+" Adapted from https://github.com/vim/vim/blob/master/src/testdir/runtest.vim
+"
+" When debugging tests it can help to write debug output:
+"    call Log('oh noes')
+"
+
+function RunTest(test)
+  if exists("*SetUp")
+    call SetUp()
+  endif
+
+  try
+    execute 'call '.a:test
+  catch
+    call Exception()
+    let s:errored = 1
+  endtry
+
+  if exists("*TearDown")
+    call TearDown()
+  endif
+endfunction
+
+function Log(msg)
+  if type(a:msg) == type('')
+    call add(s:messages, a:msg)
+  elseif type(a:msg) == type([])
+    call extend(s:messages, a:msg)
+  else
+    call add(v:errors, 'Exception: unsupported type: '.type(a:msg))
+  endif
+endfunction
+
+function Exception()
+  call add(v:errors, v:throwpoint.'..'.'Exception: '.v:exception)
+endfunction
+
+" Shuffles list in place.
+function Shuffle(list)
+  " Fisher-Yates-Durstenfeld-Knuth
+  let n = len(a:list)
+  if n < 2
+    return a:list
+  endif
+  for i in range(0, n-2)
+    let j = Random(0, n-i-1)
+    let e = a:list[i]
+    let a:list[i] = a:list[i+j]
+    let a:list[i+j] = e
+  endfor
+  return a:list
+endfunction
+
+" Returns a pseudorandom integer i such that 0 <= i <= max
+function Random(min, max)
+  if has('unix')
+    let i = system('echo $RANDOM')  " 0 <= i <= 32767
+  else
+    let i = system('echo %RANDOM%')  " 0 <= i <= 32767
+  endif
+  return i * (a:max - a:min + 1) / 32768 + a:min
+endfunction
+
+function FriendlyName(test_name)
+  return substitute(a:test_name[5:-3], '_', ' ', 'g')
+endfunction
+
+function Align(left, right)
+  if type(a:right) == type([])
+    let result = []
+    for s in a:right
+      if empty(result)
+        call add(result, printf('%-'.s:indent.'S', a:left).s)
+      else
+        call add(result, printf('%-'.s:indent.'S',     '').s)
+      endif
+    endfor
+    return result
+  endif
+
+  return printf('%-'.s:indent.'S', a:left).a:right
+endfunction
+
+let g:testname = expand('%')
+let s:errored = 0
+let s:done = 0
+let s:fail = 0
+let s:errors = 0
+let s:messages = []
+let s:indent = ''
+
+call Log(g:testname.':')
+
+" Source the test script.
+try
+  source %
+catch
+  let s:errors += 1
+  call Exception()
+endtry
+
+" Locate the test functions.
+set nomore
+redir @q
+silent function /^Test_
+redir END
+let s:tests = split(substitute(@q, 'function \(\k*()\)', '\1', 'g'))
+
+" If there is another argument, filter test-functions' names against it.
+if argc() > 1
+  let s:tests = filter(s:tests, 'v:val =~ argv(1)')
+endif
+
+let s:indent = max(map(copy(s:tests), {_, val -> len(FriendlyName(val))}))
+
+" Run the tests in random order.
+for test in Shuffle(s:tests)
+  call RunTest(test)
+  let s:done += 1
+
+  let friendly_name = FriendlyName(test)
+  if len(v:errors) == 0
+    call Log(Align(friendly_name, ' - ok'))
+  else
+    if s:errored
+      let s:errors += 1
+      let s:errored = 0
+    else
+      let s:fail += 1
+    endif
+    call Log(Align(friendly_name, ' - not ok'))
+
+    let i = 0
+    for error in v:errors
+      if i != 0
+        call Log(Align('','   ! ----'))
+      endif
+      for trace in reverse(split(error, '\.\.'))
+        call Log(Align('', '   ! '.trace))
+      endfor
+      let i += 1
+    endfor
+
+    let v:errors = []
+  endif
+endfor
+
+let summary = [
+      \ s:done.(  s:done   == 1 ? ' test'    : ' tests'),
+      \ s:errors.(s:errors == 1 ? ' error'   : ' errors'),
+      \ s:fail.(  s:fail   == 1 ? ' failure' : ' failures'),
+      \ ]
+call Log('')
+call Log(join(summary, ', '))
+
+split messages.log
+call append(line('$'), s:messages)
+write
+
+qall!
+
diff --git a/vim/.vim/plugged/vim-gitgutter/test/test b/vim/.vim/plugged/vim-gitgutter/test/test
new file mode 100644
index 0000000..4daf052
--- /dev/null
+++ b/vim/.vim/plugged/vim-gitgutter/test/test
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+VIM="/Applications/MacVim.app/Contents/MacOS/Vim -v"
+
+export VIM_GITGUTTER_TEST=1
+
+$VIM -u NONE -U NONE -N                      \
+  --cmd 'set rtp+=../'                       \
+  --cmd 'let g:gitgutter_async=0'            \
+  --cmd 'source ../plugin/gitgutter.vim'     \
+  -S runner.vim                              \
+  test_*.vim                                 \
+  $*
+
+cat messages.log
+
+grep -q "0 errors, 0 failures" messages.log
+status=$?
+rm messages.log
+exit $status
+
diff --git a/vim/.vim/plugged/vim-gitgutter/test/test_gitgutter.vim b/vim/.vim/plugged/vim-gitgutter/test/test_gitgutter.vim
new file mode 100644
index 0000000..855eca3
--- /dev/null
+++ b/vim/.vim/plugged/vim-gitgutter/test/test_gitgutter.vim
@@ -0,0 +1,680 @@
+let s:current_dir = expand('%:p:h')
+let s:test_repo   = s:current_dir.'/test-repo'
+let s:bufnr       = bufnr('')
+
+"
+" Helpers
+"
+
+function s:signs(filename)
+  redir => signs
+    silent execute 'sign place'
+  redir END
+
+  let signs = split(signs, '\n')
+
+  " filter out signs for this test file
+  " assumes a:filename's signs are last set listed
+  let i = index(signs, 'Signs for '.a:filename.':')
+  let signs = (i > -1 ? signs[i+1:] : [])
+
+  call map(signs, {_, v -> substitute(v, '    ', '', '')})
+
+  return signs
+endfunction
+
+function s:git_diff()
+  return split(system('git diff -U0 fixture.txt'), '\n')
+endfunction
+
+function s:git_diff_staged()
+  return split(system('git diff -U0 --staged fixture.txt'), '\n')
+endfunction
+
+function s:trigger_gitgutter()
+  doautocmd CursorHold
+endfunction
+
+
+"
+" SetUp / TearDown
+"
+
+function SetUp()
+  call system("git init ".s:test_repo.
+        \ " && cd ".s:test_repo.
+        \ " && cp ../fixture.txt .".
+        \ " && git add . && git commit -m 'initial'".
+        \ " && git config diff.mnemonicPrefix false")
+  execute ':cd' s:test_repo
+  edit! fixture.txt
+  call gitgutter#sign#reset()
+endfunction
+
+function TearDown()
+  " delete all buffers except this one
+  " TODO: move to runner.vim, accounting for multiple test files
+  if s:bufnr > 1
+    silent! execute '1,'.s:bufnr-1.'bdelete!'
+  endif
+  silent! execute s:bufnr+1.',$bdelete!'
+
+  execute ':cd' s:current_dir
+  call system("rm -rf ".s:test_repo)
+endfunction
+
+"
+" The tests
+"
+
+function Test_add_lines()
+  normal ggo*
+  call s:trigger_gitgutter()
+
+  let expected = ["line=2  id=3000  name=GitGutterLineAdded"]
+  call assert_equal(expected, s:signs('fixture.txt'))
+endfunction
+
+
+function Test_add_lines_fish()
+  let _shell = &shell
+  set shell=/usr/local/bin/fish
+
+  normal ggo*
+  call s:trigger_gitgutter()
+
+  let expected = ["line=2  id=3000  name=GitGutterLineAdded"]
+  call assert_equal(expected, s:signs('fixture.txt'))
+
+  let &shell = _shell
+endfunction
+
+
+function Test_modify_lines()
+  normal ggi*
+  call s:trigger_gitgutter()
+
+  let expected = ["line=1  id=3000  name=GitGutterLineModified"]
+  call assert_equal(expected, s:signs('fixture.txt'))
+endfunction
+
+
+function Test_remove_lines()
+  execute '5d'
+  call s:trigger_gitgutter()
+
+  let expected = ["line=4  id=3000  name=GitGutterLineRemoved"]
+  call assert_equal(expected, s:signs('fixture.txt'))
+endfunction
+
+
+function Test_remove_first_lines()
+  execute '1d'
+  call s:trigger_gitgutter()
+
+  let expected = ["line=1  id=3000  name=GitGutterLineRemovedFirstLine"]
+  call assert_equal(expected, s:signs('fixture.txt'))
+endfunction
+
+
+function Test_overlapping_hunks()
+  execute '3d'
+  execute '1d'
+  call s:trigger_gitgutter()
+
+  let expected = ["line=1  id=3000  name=GitGutterLineRemovedAboveAndBelow"]
+  call assert_equal(expected, s:signs('fixture.txt'))
+endfunction
+
+
+function Test_edit_file_with_same_name_as_a_branch()
+  normal 5Gi*
+  call system('git checkout -b fixture.txt')
+  call s:trigger_gitgutter()
+
+  let expected = ["line=5  id=3000  name=GitGutterLineModified"]
+  call assert_equal(expected, s:signs('fixture.txt'))
+endfunction
+
+
+function Test_file_added_to_git()
+  let tmpfile = 'fileAddedToGit.tmp'
+  call system('touch '.tmpfile.' && git add '.tmpfile)
+  execute 'edit '.tmpfile
+  normal ihello
+  call s:trigger_gitgutter()
+
+  let expected = ["line=1  id=3000  name=GitGutterLineAdded"]
+  call assert_equal(expected, s:signs('fileAddedToGit.tmp'))
+endfunction
+
+
+function Test_filename_with_equals()
+  call system('touch =fixture=.txt && git add =fixture=.txt')
+  edit =fixture=.txt
+  normal ggo*
+  call s:trigger_gitgutter()
+
+  let expected = [
+        \ 'line=1  id=3000  name=GitGutterLineAdded',
+        \ 'line=2  id=3001  name=GitGutterLineAdded'
+        \ ]
+  call assert_equal(expected, s:signs('=fixture=.txt'))
+endfunction
+
+
+function Test_filename_with_square_brackets()
+  call system('touch fix[tu]re.txt && git add fix[tu]re.txt')
+  edit fix[tu]re.txt
+  normal ggo*
+  call s:trigger_gitgutter()
+
+  let expected = [
+        \ 'line=1  id=3000  name=GitGutterLineAdded',
+        \ 'line=2  id=3001  name=GitGutterLineAdded'
+        \ ]
+  call assert_equal(expected, s:signs('fix[tu]re.txt'))
+endfunction
+
+
+function Test_filename_leading_dash()
+  call system('touch -- -fixture.txt && git add -- -fixture.txt')
+  edit -fixture.txt
+  normal ggo*
+  call s:trigger_gitgutter()
+
+  let expected = [
+        \ 'line=1  id=3000  name=GitGutterLineAdded',
+        \ 'line=2  id=3001  name=GitGutterLineAdded'
+        \ ]
+  call assert_equal(expected, s:signs('-fixture.txt'))
+endfunction
+
+
+function Test_filename_umlaut()
+  call system('touch -- fixtﾃｼre.txt && git add -- fixtﾃｼre.txt')
+  edit fixtﾃｼre.txt
+  normal ggo*
+  call s:trigger_gitgutter()
+
+  let expected = [
+        \ 'line=1  id=3000  name=GitGutterLineAdded',
+        \ 'line=2  id=3001  name=GitGutterLineAdded'
+        \ ]
+  call assert_equal(expected, s:signs('fixtﾃｼre.txt'))
+endfunction
+
+
+" FIXME: this test fails when it is the first (or only) test to be run
+function Test_follow_symlink()
+  let tmp = 'symlink'
+  call system('ln -nfs fixture.txt '.tmp)
+  execute 'edit '.tmp
+  6d
+  call s:trigger_gitgutter()
+
+  let expected = ['line=5  id=3000  name=GitGutterLineRemoved']
+  call assert_equal(expected, s:signs('symlink'))
+endfunction
+
+
+function Test_keep_alt()
+  enew
+  execute "normal! \<C-^>"
+
+  call assert_equal('fixture.txt', bufname(''))
+  call assert_equal('',            bufname('#'))
+
+  normal ggx
+  call s:trigger_gitgutter()
+
+  call assert_equal('', bufname('#'))
+endfunction
+
+
+function Test_keep_modified()
+  normal 5Go*
+  call assert_equal(1, getbufvar('', '&modified'))
+
+  call s:trigger_gitgutter()
+
+  call assert_equal(1, getbufvar('', '&modified'))
+endfunction
+
+
+function Test_keep_op_marks()
+  normal 5Go*
+  call assert_equal([0,6,1,0], getpos("'["))
+  call assert_equal([0,6,2,0], getpos("']"))
+
+  call s:trigger_gitgutter()
+
+  call assert_equal([0,6,1,0], getpos("'["))
+  call assert_equal([0,6,2,0], getpos("']"))
+endfunction
+
+
+function Test_no_modifications()
+  call assert_equal([], s:signs('fixture.txt'))
+endfunction
+
+
+function Test_orphaned_signs()
+  execute "normal 5GoX\<CR>Y"
+  call s:trigger_gitgutter()
+  6d
+  call s:trigger_gitgutter()
+
+  let expected = ['line=6  id=3001  name=GitGutterLineAdded']
+  call assert_equal(expected, s:signs('fixture.txt'))
+endfunction
+
+
+function Test_untracked_file_outside_repo()
+  let tmp = tempname()
+  call system('touch '.tmp)
+  execute 'edit '.tmp
+
+  call assert_equal([], s:signs(tmp))
+endfunction
+
+
+function Test_untracked_file_within_repo()
+  let tmp = 'untrackedFileWithinRepo.tmp'
+  call system('touch '.tmp)
+  execute 'edit '.tmp
+  normal ggo*
+  call s:trigger_gitgutter()
+
+  call assert_equal([], s:signs(tmp))
+  call assert_equal(-2, b:gitgutter.path)
+
+  call system('rm '.tmp)
+endfunction
+
+
+function Test_untracked_file_square_brackets_within_repo()
+  let tmp = '[un]trackedFileWithinRepo.tmp'
+  call system('touch '.tmp)
+  execute 'edit '.tmp
+  normal ggo*
+  call s:trigger_gitgutter()
+
+  call assert_equal([], s:signs(tmp))
+
+  call system('rm '.tmp)
+endfunction
+
+
+function Test_hunk_outside_noop()
+  normal 5G
+  GitGutterStageHunk
+
+  call assert_equal([], s:signs('fixture.txt'))
+  call assert_equal([], s:git_diff())
+  call assert_equal([], s:git_diff_staged())
+
+  GitGutterUndoHunk
+
+  call assert_equal([], s:signs('fixture.txt'))
+  call assert_equal([], s:git_diff())
+  call assert_equal([], s:git_diff_staged())
+endfunction
+
+
+function Test_hunk_stage()
+  let _shell = &shell
+  set shell=foo
+
+  normal 5Gi*
+  GitGutterStageHunk
+
+  call assert_equal('foo', &shell)
+  let &shell = _shell
+
+  call assert_equal([], s:signs('fixture.txt'))
+
+  " Buffer is unsaved
+  let expected = [
+        \ 'diff --git a/fixture.txt b/fixture.txt',
+        \ 'index ae8e546..f5c6aff 100644',
+        \ '--- a/fixture.txt',
+        \ '+++ b/fixture.txt',
+        \ '@@ -5 +5 @@ d',
+        \ '-*e',
+        \ '+e'
+        \ ]
+  call assert_equal(expected, s:git_diff())
+
+  " Index has been updated
+  let expected = [
+        \ 'diff --git a/fixture.txt b/fixture.txt',
+        \ 'index f5c6aff..ae8e546 100644',
+        \ '--- a/fixture.txt',
+        \ '+++ b/fixture.txt',
+        \ '@@ -5 +5 @@ d',
+        \ '-e',
+        \ '+*e'
+        \ ]
+  call assert_equal(expected, s:git_diff_staged())
+
+  " Save the buffer
+  write
+
+  call assert_equal([], s:git_diff())
+endfunction
+
+
+function Test_hunk_stage_nearby_hunk()
+  execute "normal! 2Gox\<CR>y\<CR>z"
+  normal 2jdd
+  normal k
+  GitGutterStageHunk
+
+  let expected = [
+        \ 'line=3  id=3000  name=GitGutterLineAdded',
+        \ 'line=4  id=3001  name=GitGutterLineAdded',
+        \ 'line=5  id=3002  name=GitGutterLineAdded'
+        \ ]
+  call assert_equal(expected, s:signs('fixture.txt'))
+
+  " Buffer is unsaved
+  let expected = [
+        \ 'diff --git a/fixture.txt b/fixture.txt',
+        \ 'index 53b13df..f5c6aff 100644',
+        \ '--- a/fixture.txt',
+        \ '+++ b/fixture.txt',
+        \ '@@ -3,0 +4 @@ c',
+        \ '+d',
+        \ ]
+  call assert_equal(expected, s:git_diff())
+
+  " Index has been updated
+  let expected = [
+        \ 'diff --git a/fixture.txt b/fixture.txt',
+        \ 'index f5c6aff..53b13df 100644',
+        \ '--- a/fixture.txt',
+        \ '+++ b/fixture.txt',
+        \ '@@ -4 +3,0 @@ c',
+        \ '-d',
+        \ ]
+  call assert_equal(expected, s:git_diff_staged())
+
+  " Save the buffer
+  write
+
+  let expected = [
+        \ 'diff --git a/fixture.txt b/fixture.txt',
+        \ 'index 53b13df..8fdfda7 100644',
+        \ '--- a/fixture.txt',
+        \ '+++ b/fixture.txt',
+        \ '@@ -2,0 +3,3 @@ b',
+        \ '+x',
+        \ '+y',
+        \ '+z',
+        \ ]
+  call assert_equal(expected, s:git_diff())
+endfunction
+
+
+function Test_hunk_undo()
+  let _shell = &shell
+  set shell=foo
+
+  normal 5Gi*
+  GitGutterUndoHunk
+
+  call assert_equal('foo', &shell)
+  let &shell = _shell
+
+  call assert_equal([], s:signs('fixture.txt'))
+  call assert_equal([], s:git_diff())
+  call assert_equal([], s:git_diff_staged())
+endfunction
+
+
+function Test_undo_nearby_hunk()
+  execute "normal! 2Gox\<CR>y\<CR>z"
+  normal 2jdd
+  normal k
+  call s:trigger_gitgutter()
+  GitGutterUndoHunk
+  call s:trigger_gitgutter()
+
+  let expected = [
+        \ 'line=3  id=3000  name=GitGutterLineAdded',
+        \ 'line=4  id=3001  name=GitGutterLineAdded',
+        \ 'line=5  id=3002  name=GitGutterLineAdded'
+        \ ]
+  call assert_equal(expected, s:signs('fixture.txt'))
+
+  call assert_equal([], s:git_diff())
+
+  call assert_equal([], s:git_diff_staged())
+
+  " Save the buffer
+  write
+
+  let expected = [
+        \ 'diff --git a/fixture.txt b/fixture.txt',
+        \ 'index f5c6aff..3fbde56 100644',
+        \ '--- a/fixture.txt',
+        \ '+++ b/fixture.txt',
+        \ '@@ -2,0 +3,3 @@ b',
+        \ '+x',
+        \ '+y',
+        \ '+z',
+        \ ]
+  call assert_equal(expected, s:git_diff())
+
+endfunction
+
+
+function Test_overlapping_hunk_op()
+  func Answer(char)
+    call feedkeys(a:char."\<CR>")
+  endfunc
+
+  " Undo upper
+
+  execute '3d'
+  execute '1d'
+  call s:trigger_gitgutter()
+  normal gg
+  call timer_start(100, {-> Answer('u')} )
+  GitGutterUndoHunk
+  call s:trigger_gitgutter()
+
+  let expected = [
+        \ 'line=2  id=3000  name=GitGutterLineRemoved',
+        \ ]
+  call assert_equal(expected, s:signs('fixture.txt'))
+
+  " Undo lower
+
+  execute '1d'
+  call s:trigger_gitgutter()
+  normal gg
+  call timer_start(100, {-> Answer('l')} )
+  GitGutterUndoHunk
+  call s:trigger_gitgutter()
+
+  let expected = [
+        \ 'line=1  id=3000  name=GitGutterLineRemovedFirstLine',
+        \ ]
+  call assert_equal(expected, s:signs('fixture.txt'))
+endfunction
+
+
+function Test_write_option()
+  set nowrite
+
+  normal ggo*
+  call s:trigger_gitgutter()
+
+  let expected = ["line=2  id=3000  name=GitGutterLineAdded"]
+  call assert_equal(expected, s:signs('fixture.txt'))
+
+  set write
+endfunction
+
+
+function Test_inner_text_object()
+  execute "normal! 2Gox\<CR>y\<CR>z\<CR>\<CR>"
+  call s:trigger_gitgutter()
+  normal dic
+  call s:trigger_gitgutter()
+
+  call assert_equal([], s:signs('fixture.txt'))
+  call assert_equal(readfile('fixture.txt'), getline(1,'$'))
+
+  " Excludes trailing lines
+  normal 9Gi*
+  normal 10Gi*
+  call s:trigger_gitgutter()
+  execute "normal vic\<Esc>"
+  call assert_equal([9, 10], [line("'<"), line("'>")])
+endfunction
+
+
+function Test_around_text_object()
+  execute "normal! 2Gox\<CR>y\<CR>z\<CR>\<CR>"
+  call s:trigger_gitgutter()
+  normal dac
+  call s:trigger_gitgutter()
+
+  call assert_equal([], s:signs('fixture.txt'))
+  call assert_equal(readfile('fixture.txt'), getline(1,'$'))
+
+  " Includes trailing lines
+  normal 9Gi*
+  normal 10Gi*
+  call s:trigger_gitgutter()
+  execute "normal vac\<Esc>"
+  call assert_equal([9, 11], [line("'<"), line("'>")])
+endfunction
+
+
+function Test_user_autocmd()
+  autocmd User GitGutter let s:autocmd_user = g:gitgutter_hook_context.bufnr
+
+  " Verify not fired when nothing changed.
+  let s:autocmd_user = 0
+  call s:trigger_gitgutter()
+  call assert_equal(0, s:autocmd_user)
+
+  " Verify fired when there was a change.
+  normal ggo*
+  let bufnr = bufnr('')
+  call s:trigger_gitgutter()
+  call assert_equal(bufnr, s:autocmd_user)
+endfunction
+
+
+function Test_fix_file_references()
+  " No special characters
+  let hunk_diff = join([
+        \ 'diff --git a/fixture.txt b/fixture.txt',
+        \ 'index f5c6aff..3fbde56 100644',
+        \ '--- a/fixture.txt',
+        \ '+++ b/fixture.txt',
+        \ '@@ -2,0 +3,1 @@ b',
+        \ '+x'
+        \ ], "\n")."\n"
+  let filepath = 'blah.txt'
+
+  let expected = join([
+        \ 'diff --git a/blah.txt b/blah.txt',
+        \ 'index f5c6aff..3fbde56 100644',
+        \ '--- a/blah.txt',
+        \ '+++ b/blah.txt',
+        \ '@@ -2,0 +3,1 @@ b',
+        \ '+x'
+        \ ], "\n")."\n"
+
+  call assert_equal(expected, gitgutter#hunk#fix_file_references(filepath, hunk_diff))
+
+  " diff.mnemonicPrefix; spaces in filename
+  let hunk_diff = join([
+        \ 'diff --git i/x/cat dog w/x/cat dog',
+        \ 'index f5c6aff..3fbde56 100644',
+        \ '--- i/x/cat dog',
+        \ '+++ w/x/cat dog',
+        \ '@@ -2,0 +3,1 @@ b',
+        \ '+x'
+        \ ], "\n")."\n"
+  let filepath = 'blah.txt'
+
+  let expected = join([
+        \ 'diff --git i/blah.txt w/blah.txt',
+        \ 'index f5c6aff..3fbde56 100644',
+        \ '--- i/blah.txt',
+        \ '+++ w/blah.txt',
+        \ '@@ -2,0 +3,1 @@ b',
+        \ '+x'
+        \ ], "\n")."\n"
+
+  call assert_equal(expected, gitgutter#hunk#fix_file_references(filepath, hunk_diff))
+
+  " Backslashes in filename; quotation marks
+  let hunk_diff = join([
+        \ 'diff --git "a/C:\\Users\\FOO~1.PAR\\AppData\\Local\\Temp\\nvimJcmSv9\\11.1.vim" "b/C:\\Users\\FOO~1.PAR\\AppData\\Local\\Temp\\nvimJcmSv9\\12.1.vim"',
+        \ 'index f42aeb0..4930403 100644',
+        \ '--- "a/C:\\Users\\FOO~1.PAR\\AppData\\Local\\Temp\\nvimJcmSv9\\11.1.vim"',
+        \ '+++ "b/C:\\Users\\FOO~1.PAR\\AppData\\Local\\Temp\\nvimJcmSv9\\12.1.vim"',
+        \ '@@ -172,0 +173 @@ stuff',
+        \ '+x'
+        \ ], "\n")."\n"
+  let filepath = 'init.vim'
+
+  let expected = join([
+        \ 'diff --git "a/init.vim" "b/init.vim"',
+        \ 'index f42aeb0..4930403 100644',
+        \ '--- "a/init.vim"',
+        \ '+++ "b/init.vim"',
+        \ '@@ -172,0 +173 @@ stuff',
+        \ '+x'
+        \ ], "\n")."\n"
+
+  call assert_equal(expected, gitgutter#hunk#fix_file_references(filepath, hunk_diff))
+endfunction
+
+
+function Test_encoding()
+  call system('cp ../cp932.txt . && git add cp932.txt')
+  edit ++enc=cp932 cp932.txt
+
+  call s:trigger_gitgutter()
+
+  call assert_equal([], s:signs('cp932.txt'))
+endfunction
+
+
+function Test_empty_file()
+  " 0-byte file
+  call system('touch empty.txt && git add empty.txt')
+  edit empty.txt
+
+  call s:trigger_gitgutter()
+  call assert_equal([], s:signs('empty.txt'))
+
+
+  " File consisting only of a newline
+  call system('echo "" > newline.txt && git add newline.txt')
+  edit newline.txt
+
+  call s:trigger_gitgutter()
+  call assert_equal([], s:signs('newline.txt'))
+
+
+  " 1 line file without newline
+  " Vim will force a newline unless we tell it not to.
+  call system('echo -n a > oneline.txt && git add oneline.txt')
+  set noeol nofixeol
+  edit! oneline.txt
+
+  call s:trigger_gitgutter()
+  call assert_equal([], s:signs('oneline.txt'))
+
+  set eol fixeol
+endfunction