Merge pull request #757 from tsuyoshicho/fix/homeexpand-20200926

fix: System.Filepath.expand_home() fix for completeslash

Author: ujihisa

autoload/vital/__vital__/System/Filepath.vim

@@ -15,6 +15,7 @@ let s:is_cygwin = has('win32unix')
 let s:is_mac = !s:is_windows && !s:is_cygwin
       \ && (has('mac') || has('macunix') || has('gui_macvim') ||
       \   (!isdirectory('/proc') && executable('sw_vers')))
+
 let s:is_case_tolerant = filereadable(expand('<sfile>:r') . '.VIM')
 
 if s:is_windows
@@ -203,8 +204,8 @@ function! s:expand_home(path) abort
   endif
   let post_home_idx = match(a:path, s:path_sep_pattern)
   return post_home_idx is# -1
-        \ ? s:remove_last_separator(expand(a:path))
-        \ : s:remove_last_separator(expand(a:path[0 : post_home_idx - 1]))
+        \ ? s:remove_last_separator(s:expand(a:path))
+        \ : s:remove_last_separator(s:expand(a:path[0 : post_home_idx - 1]))
         \   . a:path[post_home_idx :]
 endfunction
 
@@ -236,7 +237,7 @@ endfunction
 
 if s:is_windows
   function! s:realpath(path) abort
-    if exists('&shellslash') && &shellslash
+    if exists('+shellslash') && &shellslash
       return s:unixpath(a:path)
     else
       return s:winpath(a:path)
@@ -279,6 +280,23 @@ function! s:contains(path, base) abort
   return pathlist[: baselistlen - 1] ==# baselist
 endfunction
 
+if exists('+completeslash')
+  " completeslash bug in Windows and specific version range (Vim 8.1.1769 - Vim 8.2.1746)
+  function! s:expand(path) abort
+    let backup_completeslash = &completeslash
+    try
+      set completeslash&
+      return expand(a:path)
+    finally
+      let &completeslash = backup_completeslash
+    endtry
+  endfunction
+else
+  function! s:expand(path) abort
+    return expand(a:path)
+  endfunction
+endif
+
 let &cpo = s:save_cpo
 unlet s:save_cpo
 

test/System/Filepath.vimspec

@@ -1,5 +1,6 @@
 let s:V = vital#vital#new()
 let s:is_windows = has('win32')
+let s:is_mac = has('mac')
 
 Describe System.Filepath
   Before all
@@ -121,6 +122,82 @@ Describe System.Filepath
     End
   End
 
+  Describe .expand_home()
+    if s:is_windows
+      It [windows] non home path are no expanded, there are same.
+        let path = 'C:/Hoge'
+        let ret = FP.expand_home(path)
+        Assert Equals(ret, path)
+      End
+    else
+      It [unix] non home path are no expanded, there are same.
+        let path = '/Hoge'
+        let ret = FP.expand_home(path)
+        Assert Equals(ret, path)
+      End
+    endif
+    It expand head ~ home path
+      if s:is_windows
+        let path = '~\Hoge'
+      else
+        let path = '~/Hoge'
+      endif
+      let ret = FP.expand_home(path)
+      Assert Equals(ret, $HOME . FP.separator() . 'Hoge')
+    End
+    It  include .. in path no-expand, but head ~ home expanded.
+      if s:is_windows
+        let target = '~\Hoge\..\Fuga'
+      else
+        let target = '~/Hoge/../Fuga'
+      endif
+      let path = '~' . FP.separator() . target
+      let ret = FP.expand_home(path)
+      Assert Equals(ret, $HOME . FP.separator() . target)
+    End
+    if s:is_windows
+      " need completeslash test
+      if exists('&completeslash')
+        It [windows] completeslash not set home expand test
+          let backup_completeslash = &completeslash
+          set completeslash&
+          let path = '~\Hoge'
+          let ret = FP.expand_home(path)
+          Assert Equals(ret, $HOME . FP.separator() . 'Hoge')
+          let &completeslash = backup_completeslash
+        End
+        It [windows] completeslash=slash home expand test
+          let backup_completeslash = &completeslash
+          set completeslash=slash
+          let path = '~\Hoge'
+          let ret = FP.expand_home(path)
+          Assert Equals(ret, $HOME . FP.separator() . 'Hoge')
+          let &completeslash = backup_completeslash
+        End
+        It [windows] completeslash=backslash home expand test
+          let backup_completeslash = &completeslash
+          set completeslash=backslash
+          let path = '~\Hoge'
+          let ret = FP.expand_home(path)
+          Assert Equals(ret, $HOME . FP.separator() . 'Hoge')
+          let &completeslash = backup_completeslash
+        End
+      endif
+    else
+      " need ~user test
+      It [unix] ~user expand check
+        let path = '~root/Hoge'
+        let ret = FP.expand_home(path)
+        if s:is_mac
+          let expect = '/var/root/Hoge'
+        else
+          let expect = '/root/Hoge'
+        endif
+        Assert Equals(ret, expect)
+      End
+    endif
+  End
+
   Describe .winpath()
     It should substitute slashes in {path} to backslashes
       let path = '/Foo/Bar/Hoge.txt'