mhoward/dotfiles: comparison .vim/autoload/plug.vim

-:152f0c95cbb0
+:b6105413b6b7
 endfunction
 function! s:is_local_plug(repo)
 return a:repo =~? '^[a-z]:\|^[%~]'
 endfunction
+" Copied from fzf
+function! s:wrap_cmds(cmds)
+return map(['@echo off','setlocal enabledelayedexpansion','for /f "delims=: tokens=2" %%a in (''chcp'') do set origchcp=%%a','set origchcp=!origchcp: =!','chcp 65001 > nul'] +
+\ (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) +
+\ ['chcp !origchcp! > nul','setlocal disabledelayedexpansion'],'v:val."\r"')
+endfunction
+function! s:batchfile(cmd)
+let batchfile = tempname().'.bat'
+call writefile(s:wrap_cmds(a:cmd), batchfile)
+let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 1})
+if &shell =~# 'powershell\.exe$'
+let cmd = '& ' . cmd
+endif
+return [batchfile, cmd]
+endfunction
 else
 function! s:rtp(spec)
 return s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
 endfunction
 let [sh, shellcmdflag, shrd] = s:chsh(a:0)
 " FIXME: Escaping is incomplete. We could use shellescape with eval,
 "        but it won't work on Windows.
 let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
 if s:is_win
-let batchfile = tempname().'.bat'
+let [batchfile, cmd] = s:batchfile(cmd)
-call writefile(["@echo off\r", cmd . "\r"], batchfile)
-let cmd = s:shellesc(expand(batchfile))
 endif
 let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
 execute "normal! :execute g:_plug_bang\<cr>\<cr>"
 finally
 unlet g:_plug_bang
 call s:log4(name, 'Checking out '.spec.commit)
 let out = s:checkout(spec)
 elseif has_key(spec, 'tag')
 let tag = spec.tag
 if tag =~ '\*'
-let tags = s:lines(s:system('git tag --list '.s:shellesc(tag).' --sort -version:refname 2>&1', spec.dir))
+let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir))
 if !v:shell_error && !empty(tags)
 let tag = tags[0]
 call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag))
 call append(3, '')
 endif
 silent! call jobstop(j.jobid)
 elseif s:vim8
 silent! call job_stop(j.jobid)
 endif
 if j.new
-call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir))
+call s:system('rm -rf ' . plug#shellescape(g:plugs[name].dir))
 endif
 endfor
 let s:jobs = {}
 endfunction
 \ s:job_cb('s:job_exit_cb', self, 0, a:data)
 endfunction
 function! s:spawn(name, cmd, opts)
 let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''],
-\ 'batchfile': (s:is_win && (s:nvim || s:vim8)) ? tempname().'.bat' : '',
 \ 'new': get(a:opts, 'new', 0) }
 let s:jobs[a:name] = job
-let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
+let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir, 0) : a:cmd
-if !empty(job.batchfile)
+let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd]
-call writefile(["@echo off\r", cmd . "\r"], job.batchfile)
-let cmd = s:shellesc(expand(job.batchfile))
-endif
-let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
 if s:nvim
 call extend(job, {
 \ 'on_stdout': function('s:nvim_cb'),
 \ 'on_exit':   function('s:nvim_cb'),
 let bullet = job.error ? 'x' : '-'
 let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines)
 call s:log(bullet, a:name, empty(result) ? 'OK' : result)
 call s:bar()
-if has_key(job, 'batchfile') && !empty(job.batchfile)
-call delete(job.batchfile)
-endif
 call remove(s:jobs, a:name)
 endfunction
 function! s:bar()
 if s:switch_in()
 else
 call s:spawn(name,
 \ printf('git clone %s %s %s %s 2>&1',
 \ has_tag ? '' : s:clone_opt,
 \ prog,
-\ s:shellesc(spec.uri),
+\ plug#shellescape(spec.uri, {'script': 0}),
-\ s:shellesc(s:trim(spec.dir))), { 'new': 1 })
+\ plug#shellescape(s:trim(spec.dir), {'script': 0})), { 'new': 1 })
 endif
 if !s:jobs[name].running
 call s:reap(name)
 endif
 refresh.kill if refresh
 watcher.kill
 EOF
 endfunction
-function! s:shellesc_cmd(arg)
+function! s:shellesc_cmd(arg, script)
-let escaped = substitute(a:arg, '[&|<>()@^]', '^&', 'g')
+let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g')
-let escaped = substitute(escaped, '%', '%%', 'g')
+return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g')
-let escaped = substitute(escaped, '"', '\\^&', 'g')
+endfunction
-let escaped = substitute(escaped, '\(\\\+\)\(\\^\)', '\1\1\2', 'g')
-return '^"'.substitute(escaped, '\(\\\+\)$', '\1\1', '').'^"'
+function! s:shellesc_ps1(arg)
-endfunction
+return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'"
+endfunction
-function! s:shellesc(arg)
-if &shell =~# 'cmd.exe$'
+function! plug#shellescape(arg, ...)
-return s:shellesc_cmd(a:arg)
+let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {}
+let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh')
+let script = get(opts, 'script', 1)
+if shell =~# 'cmd\.exe$'
+return s:shellesc_cmd(a:arg, script)
+elseif shell =~# 'powershell\.exe$' || shell =~# 'pwsh$'
+return s:shellesc_ps1(a:arg)
 endif
 return shellescape(a:arg)
 endfunction
 function! s:glob_dir(path)
 let lines = map(s:lines(a:message), '"    ".v:val')
 return extend([printf('x %s:', a:name)], lines)
 endif
 endfunction
-function! s:with_cd(cmd, dir)
+function! s:with_cd(cmd, dir, ...)
-return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd)
+let script = a:0 > 0 ? a:1 : 1
+return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd)
 endfunction
 function! s:system(cmd, ...)
 try
 let [sh, shellcmdflag, shrd] = s:chsh(1)
 let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
 if s:is_win
-let batchfile = tempname().'.bat'
+let [batchfile, cmd] = s:batchfile(cmd)
-call writefile(["@echo off\r", cmd . "\r"], batchfile)
-let cmd = s:shellesc(expand(batchfile))
 endif
 return system(cmd)
 finally
 let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
 if s:is_win
 return [err, err =~# 'PlugClean']
 endfunction
 function! s:rm_rf(dir)
 if isdirectory(a:dir)
-call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(a:dir))
+call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . plug#shellescape(a:dir))
 endif
 endfunction
 function! s:clean(force)
 call s:prepare()
 redraw
 let tmp = tempname()
 let new = tmp . '/plug.vim'
 try
-let out = s:system(printf('git clone --depth 1 %s %s', s:shellesc(s:plug_src), s:shellesc(tmp)))
+let out = s:system(printf('git clone --depth 1 %s %s', plug#shellescape(s:plug_src), plug#shellescape(tmp)))
 if v:shell_error
 return s:err('Error upgrading vim-plug: '. out)
 endif
 if readfile(s:me) ==# readfile(new)
 wincmd P
 endif
 setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
 try
 let [sh, shellcmdflag, shrd] = s:chsh(1)
-let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
+let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
 if s:is_win
-let batchfile = tempname().'.bat'
+let [batchfile, cmd] = s:batchfile(cmd)
-call writefile(["@echo off\r", cmd . "\r"], batchfile)
-let cmd = expand(batchfile)
 endif
 execute 'silent %!' cmd
 finally
 let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
 if s:is_win
 continue
 endif
 call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
 for [k, v] in plugs
 let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
-let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
+let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 'plug#shellescape(v:val)'))
 if has_key(v, 'rtp')
-let cmd .= ' -- '.s:shellesc(v.rtp)
+let cmd .= ' -- '.plug#shellescape(v.rtp)
 endif
 let diff = s:system_chomp(cmd, v.dir)
 if !empty(diff)
 let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
 call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))

Mercurial > hg > mhoward > dotfiles / file comparison

comparison: .vim/autoload/plug.vim

.vim/autoload/plug.vim