Skip to content

Commit d415fce

Browse files
authored
Merge pull request #379 from lambdalisue/fix-rename-on-neovim-in-windows
Update `Async.File` to fix `move` and `copy` in Neovim on Windows
2 parents b6204ec + 4f7f647 commit d415fce

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

autoload/vital/_fern/Async/File.vim

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ if has('win32') && executable('cmd')
121121
let dst = substitute(a:dst, '[/\\]\+', '\', 'g')
122122
" src must NOT have trailing slush
123123
let src = substitute(src, '\\$', '', '')
124+
" apply shellescape on neovim
125+
let src = has('nvim') ? shellescape(src) : src
126+
let dst = has('nvim') ? shellescape(dst) : dst
124127
return s:Process.start([
125128
\ 'cmd.exe', '/c', 'move', '/y', src, dst,
126129
\], options)
@@ -156,6 +159,9 @@ if has('win32') && executable('cmd')
156159
let dst = substitute(a:dst, '[/\\]\+', '\', 'g')
157160
" src must NOT have trailing slush
158161
let src = substitute(src, '\\$', '', '')
162+
" apply shellescape on neovim
163+
let src = has('nvim') ? shellescape(src) : src
164+
let dst = has('nvim') ? shellescape(dst) : dst
159165
return s:Process.start([
160166
\ 'cmd', '/c', 'copy', '/y', src, dst,
161167
\], options)

autoload/vital/fern.vim

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ function! s:_format_throwpoint(throwpoint) abort
190190
return join(funcs, "\n")
191191
endfunction
192192

193+
" @vimlint(EVL102, 1, l:_)
194+
" @vimlint(EVL102, 1, l:__)
193195
function! s:_get_func_info(name) abort
194196
let name = a:name
195197
if a:name =~# '^\d\+$' " is anonymous-function
@@ -213,6 +215,8 @@ function! s:_get_func_info(name) abort
213215
\ 'attrs': filter(['dict', 'abort', 'range', 'closure'], 'signature =~# (").*" . v:val)'),
214216
\ }
215217
endfunction
218+
" @vimlint(EVL102, 0, l:__)
219+
" @vimlint(EVL102, 0, l:_)
216220

217221
" s:_get_module() returns module object wihch has all script local functions.
218222
function! s:_get_module(name) abort dict

autoload/vital/fern.vital

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fern
2-
621cda4f832d2f43f3b15cdbfb70ca36b219efc2
2+
5591eeba1bdae8e615c6460be211ea6e88d95c05
33

44
App.Spinner
55
Async.CancellationTokenSource

0 commit comments

Comments
 (0)