|
|
|
|
@ -96,7 +96,7 @@ let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
|
|
|
|
|
let s:plug_tab = get(s:, 'plug_tab', -1)
|
|
|
|
|
let s:plug_buf = get(s:, 'plug_buf', -1)
|
|
|
|
|
let s:mac_gui = has('gui_macvim') && has('gui_running')
|
|
|
|
|
let s:is_win = has('win32') || has('win64')
|
|
|
|
|
let s:is_win = has('win32')
|
|
|
|
|
let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
|
|
|
|
|
let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
|
|
|
|
|
let s:me = resolve(expand('<sfile>:p'))
|
|
|
|
|
@ -193,6 +193,14 @@ function! s:ask_no_interrupt(...)
|
|
|
|
|
endtry
|
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
function! s:lazy(plug, opt)
|
|
|
|
|
return has_key(a:plug, a:opt) &&
|
|
|
|
|
\ (empty(s:to_a(a:plug[a:opt])) ||
|
|
|
|
|
\ !isdirectory(a:plug.dir) ||
|
|
|
|
|
\ len(s:glob(s:rtp(a:plug), 'plugin')) ||
|
|
|
|
|
\ len(s:glob(s:rtp(a:plug), 'after/plugin')))
|
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
function! plug#end()
|
|
|
|
|
if !exists('g:plugs')
|
|
|
|
|
return s:err('Call plug#begin() first')
|
|
|
|
|
@ -214,7 +222,7 @@ function! plug#end()
|
|
|
|
|
continue
|
|
|
|
|
endif
|
|
|
|
|
let plug = g:plugs[name]
|
|
|
|
|
if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(plug, 'for')
|
|
|
|
|
if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for')
|
|
|
|
|
let s:loaded[name] = 1
|
|
|
|
|
continue
|
|
|
|
|
endif
|
|
|
|
|
@ -342,6 +350,23 @@ if s:is_win
|
|
|
|
|
function! s:is_local_plug(repo)
|
|
|
|
|
return a:repo =~? '^[a-z]:\|^[%~]'
|
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
" Copied from fzf
|
|
|
|
|
function! s:wrap_cmds(cmds)
|
|
|
|
|
return map(['@echo off', 'for /f "tokens=4" %%a in (''chcp'') do set origchcp=%%a', 'chcp 65001 > nul'] +
|
|
|
|
|
\ (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) +
|
|
|
|
|
\ ['chcp %origchcp% > nul'], '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', ''))
|
|
|
|
|
@ -426,8 +451,8 @@ endfunction
|
|
|
|
|
|
|
|
|
|
function! s:dobufread(names)
|
|
|
|
|
for name in a:names
|
|
|
|
|
let path = s:rtp(g:plugs[name]).'/**'
|
|
|
|
|
for dir in ['ftdetect', 'ftplugin']
|
|
|
|
|
let path = s:rtp(g:plugs[name])
|
|
|
|
|
for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin']
|
|
|
|
|
if len(finddir(dir, path))
|
|
|
|
|
if exists('#BufRead')
|
|
|
|
|
doautocmd BufRead
|
|
|
|
|
@ -763,6 +788,9 @@ function! s:prepare(...)
|
|
|
|
|
execute 'silent! unmap <buffer>' k
|
|
|
|
|
endfor
|
|
|
|
|
setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
|
|
|
|
|
if exists('+colorcolumn')
|
|
|
|
|
setlocal colorcolumn=
|
|
|
|
|
endif
|
|
|
|
|
setf vim-plug
|
|
|
|
|
if exists('g:syntax_on')
|
|
|
|
|
call s:syntax()
|
|
|
|
|
@ -783,9 +811,7 @@ endfunction
|
|
|
|
|
|
|
|
|
|
function! s:chsh(swap)
|
|
|
|
|
let prev = [&shell, &shellcmdflag, &shellredir]
|
|
|
|
|
if s:is_win
|
|
|
|
|
set shell=cmd.exe shellcmdflag=/c shellredir=>%s\ 2>&1
|
|
|
|
|
elseif a:swap
|
|
|
|
|
if !s:is_win && a:swap
|
|
|
|
|
set shell=sh shellredir=>%s\ 2>&1
|
|
|
|
|
endif
|
|
|
|
|
return prev
|
|
|
|
|
@ -798,9 +824,7 @@ function! s:bang(cmd, ...)
|
|
|
|
|
" 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'
|
|
|
|
|
call writefile(['@echo off', cmd], batchfile)
|
|
|
|
|
let cmd = batchfile
|
|
|
|
|
let [batchfile, cmd] = s:batchfile(cmd)
|
|
|
|
|
endif
|
|
|
|
|
let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
|
|
|
|
|
execute "normal! :execute g:_plug_bang\<cr>\<cr>"
|
|
|
|
|
@ -908,7 +932,7 @@ function! s:finish(pull)
|
|
|
|
|
call add(msgs, "Press 'R' to retry.")
|
|
|
|
|
endif
|
|
|
|
|
if a:pull && len(s:update.new) < len(filter(getline(5, '$'),
|
|
|
|
|
\ "v:val =~ '^- ' && stridx(v:val, 'Already up-to-date') < 0"))
|
|
|
|
|
\ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'"))
|
|
|
|
|
call add(msgs, "Press 'D' to see the updated changes.")
|
|
|
|
|
endif
|
|
|
|
|
echo join(msgs, ' ')
|
|
|
|
|
@ -1008,6 +1032,8 @@ function! s:update_impl(pull, force, args) abort
|
|
|
|
|
let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : ''
|
|
|
|
|
|
|
|
|
|
" Python version requirement (>= 2.7)
|
|
|
|
|
if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
|
|
|
|
|
redir => pyv
|
|
|
|
|
@ -1081,7 +1107,7 @@ function! s:update_finish()
|
|
|
|
|
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))
|
|
|
|
|
@ -1099,7 +1125,7 @@ function! s:update_finish()
|
|
|
|
|
if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
|
|
|
|
|
\ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
|
|
|
|
|
call s:log4(name, 'Updating submodules. This may take a while.')
|
|
|
|
|
let out .= s:bang('git submodule update --init --recursive 2>&1', spec.dir)
|
|
|
|
|
let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir)
|
|
|
|
|
endif
|
|
|
|
|
let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
|
|
|
|
|
if v:shell_error
|
|
|
|
|
@ -1138,7 +1164,7 @@ function! s:job_abort()
|
|
|
|
|
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 = {}
|
|
|
|
|
@ -1191,15 +1217,10 @@ 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
|
|
|
|
|
if !empty(job.batchfile)
|
|
|
|
|
call writefile(['@echo off', cmd], job.batchfile)
|
|
|
|
|
let cmd = job.batchfile
|
|
|
|
|
endif
|
|
|
|
|
let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
|
|
|
|
|
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir, 0) : a:cmd
|
|
|
|
|
let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd]
|
|
|
|
|
|
|
|
|
|
if s:nvim
|
|
|
|
|
call extend(job, {
|
|
|
|
|
@ -1249,9 +1270,6 @@ function! s:reap(name)
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
@ -1318,7 +1336,7 @@ while 1 " Without TCO, Vim stack is bound to explode
|
|
|
|
|
|
|
|
|
|
let name = keys(s:update.todo)[0]
|
|
|
|
|
let spec = remove(s:update.todo, name)
|
|
|
|
|
let new = !isdirectory(spec.dir)
|
|
|
|
|
let new = empty(globpath(spec.dir, '.git', 1))
|
|
|
|
|
|
|
|
|
|
call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
|
|
|
|
|
redraw
|
|
|
|
|
@ -1341,8 +1359,8 @@ while 1 " Without TCO, Vim stack is bound to explode
|
|
|
|
|
\ printf('git clone %s %s %s %s 2>&1',
|
|
|
|
|
\ has_tag ? '' : s:clone_opt,
|
|
|
|
|
\ prog,
|
|
|
|
|
\ s:shellesc(spec.uri),
|
|
|
|
|
\ s:shellesc(s:trim(spec.dir))), { 'new': 1 })
|
|
|
|
|
\ plug#shellescape(spec.uri, {'script': 0}),
|
|
|
|
|
\ plug#shellescape(s:trim(spec.dir), {'script': 0})), { 'new': 1 })
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
if !s:jobs[name].running
|
|
|
|
|
@ -1969,17 +1987,23 @@ function! s:update_ruby()
|
|
|
|
|
EOF
|
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
function! s:shellesc_cmd(arg)
|
|
|
|
|
let escaped = substitute(a:arg, '[&|<>()@^]', '^&', 'g')
|
|
|
|
|
let escaped = substitute(escaped, '%', '%%', 'g')
|
|
|
|
|
let escaped = substitute(escaped, '"', '\\^&', 'g')
|
|
|
|
|
let escaped = substitute(escaped, '\(\\\+\)\(\\^\)', '\1\1\2', 'g')
|
|
|
|
|
return '^"'.substitute(escaped, '\(\\\+\)$', '\1\1', '').'^"'
|
|
|
|
|
function! s:shellesc_cmd(arg, script)
|
|
|
|
|
let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g')
|
|
|
|
|
return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g')
|
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
function! s:shellesc_ps1(arg)
|
|
|
|
|
return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'"
|
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
function! s:shellesc(arg)
|
|
|
|
|
if &shell =~# 'cmd.exe$'
|
|
|
|
|
return s:shellesc_cmd(a:arg)
|
|
|
|
|
function! plug#shellescape(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
|
|
|
|
|
@ -2013,8 +2037,9 @@ function! s:format_message(bullet, name, message)
|
|
|
|
|
endif
|
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
function! s:with_cd(cmd, dir)
|
|
|
|
|
return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd)
|
|
|
|
|
function! s:with_cd(cmd, dir, ...)
|
|
|
|
|
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, ...)
|
|
|
|
|
@ -2022,11 +2047,9 @@ function! s:system(cmd, ...)
|
|
|
|
|
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'
|
|
|
|
|
call writefile(['@echo off', cmd], batchfile)
|
|
|
|
|
let cmd = batchfile
|
|
|
|
|
let [batchfile, cmd] = s:batchfile(cmd)
|
|
|
|
|
endif
|
|
|
|
|
return system(s:is_win ? '('.cmd.')' : cmd)
|
|
|
|
|
return system(cmd)
|
|
|
|
|
finally
|
|
|
|
|
let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
|
|
|
|
|
if s:is_win
|
|
|
|
|
@ -2102,7 +2125,7 @@ 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
|
|
|
|
|
|
|
|
|
|
@ -2211,7 +2234,7 @@ function! s:upgrade()
|
|
|
|
|
let new = tmp . '/plug.vim'
|
|
|
|
|
|
|
|
|
|
try
|
|
|
|
|
let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, 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
|
|
|
|
|
@ -2354,11 +2377,9 @@ function! s:preview_commit()
|
|
|
|
|
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'
|
|
|
|
|
call writefile(['@echo off', cmd], batchfile)
|
|
|
|
|
let cmd = batchfile
|
|
|
|
|
let [batchfile, cmd] = s:batchfile(cmd)
|
|
|
|
|
endif
|
|
|
|
|
execute 'silent %!' cmd
|
|
|
|
|
finally
|
|
|
|
|
@ -2407,7 +2428,11 @@ function! s:diff()
|
|
|
|
|
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
|
|
|
|
|
for [k, v] in plugs
|
|
|
|
|
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
|
|
|
|
|
let diff = s:system_chomp('git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')), v.dir)
|
|
|
|
|
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 .= ' -- '.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)')))
|
|
|
|
|
@ -2426,8 +2451,13 @@ function! s:diff()
|
|
|
|
|
\ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
|
|
|
|
|
|
|
|
|
|
if cnts[0] || cnts[1]
|
|
|
|
|
nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr>
|
|
|
|
|
nnoremap <silent> <buffer> o :silent! call <SID>preview_commit()<cr>
|
|
|
|
|
nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr>
|
|
|
|
|
if empty(maparg("\<cr>", 'n'))
|
|
|
|
|
nmap <buffer> <cr> <plug>(plug-preview)
|
|
|
|
|
endif
|
|
|
|
|
if empty(maparg('o', 'n'))
|
|
|
|
|
nmap <buffer> o <plug>(plug-preview)
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
if cnts[0]
|
|
|
|
|
nnoremap <silent> <buffer> X :call <SID>revert()<cr>
|
|
|
|
|
|
Dario Ernst
6 years ago