aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2016-12-08 03:31:36 +0100
committerDuncaen <mail@duncano.de>2016-12-08 03:31:36 +0100
commitb05ea3cc46898022d8321d6b3037729c07ccdce1 (patch)
tree8444b2b875fbc1ff38b9a424aeee5d3960ede941
parentea52771b156d09615ed3e70c1a38ddd9ec163de2 (diff)
downloaddotfiles-b05ea3cc46898022d8321d6b3037729c07ccdce1.tar.gz
vim: vimplug update
-rw-r--r--vim/autoload/plug.vim257
1 files changed, 171 insertions, 86 deletions
diff --git a/vim/autoload/plug.vim b/vim/autoload/plug.vim
index aee4722..d16afe8 100644
--- a/vim/autoload/plug.vim
+++ b/vim/autoload/plug.vim
@@ -98,6 +98,7 @@ 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:nvim = 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'))
let s:base_spec = { 'branch': 'master', 'frozen': 0 }
let s:TYPE = {
@@ -202,7 +203,9 @@ function! plug#end()
endif
let lod = { 'ft': {}, 'map': {}, 'cmd': {} }
- filetype off
+ if exists('g:did_load_filetypes')
+ filetype off
+ endif
for name in g:plugs_order
if !has_key(g:plugs, name)
continue
@@ -222,6 +225,7 @@ function! plug#end()
endif
call add(s:triggers[name].map, cmd)
elseif cmd =~# '^[A-Z]'
+ let cmd = substitute(cmd, '!*$', '', '')
if exists(':'.cmd) != 2
call s:assoc(lod.cmd, cmd, name)
endif
@@ -248,7 +252,7 @@ function! plug#end()
for [cmd, names] in items(lod.cmd)
execute printf(
- \ 'command! -nargs=* -range -bang %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)',
+ \ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)',
\ cmd, string(cmd), string(names))
endfor
@@ -256,8 +260,8 @@ function! plug#end()
for [mode, map_prefix, key_prefix] in
\ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
execute printf(
- \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, "%s")<CR>',
- \ mode, map, map_prefix, string(map), string(names), key_prefix)
+ \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>',
+ \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)
endfor
endfor
@@ -309,7 +313,7 @@ endfunction
function! s:git_version_requirement(...)
if !exists('s:git_version')
- let s:git_version = map(split(split(s:system('git --version'))[-1], '\.'), 'str2nr(v:val)')
+ let s:git_version = map(split(split(s:system('git --version'))[2], '\.'), 'str2nr(v:val)')
endif
return s:version_requirement(s:git_version, a:000)
endfunction
@@ -398,7 +402,7 @@ function! s:reorg_rtp()
let s:middle = get(s:, 'middle', &rtp)
let rtps = map(s:loaded_names(), 's:rtp(g:plugs[v:val])')
- let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), 'isdirectory(v:val)')
+ let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)')
let rtp = join(map(rtps, 'escape(v:val, ",")'), ',')
\ . ','.s:middle.','
\ . join(map(afters, 'escape(v:val, ",")'), ',')
@@ -497,7 +501,7 @@ function! s:lod_cmd(cmd, bang, l1, l2, args, names)
execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
endfunction
-function! s:lod_map(map, names, prefix)
+function! s:lod_map(map, names, with_prefix, prefix)
call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
call s:dobufread(a:names)
let extra = ''
@@ -509,15 +513,17 @@ function! s:lod_map(map, names, prefix)
let extra .= nr2char(c)
endwhile
- let prefix = v:count ? v:count : ''
- let prefix .= '"'.v:register.a:prefix
- if mode(1) == 'no'
- if v:operator == 'c'
- let prefix = "\<esc>" . prefix
+ if a:with_prefix
+ let prefix = v:count ? v:count : ''
+ let prefix .= '"'.v:register.a:prefix
+ if mode(1) == 'no'
+ if v:operator == 'c'
+ let prefix = "\<esc>" . prefix
+ endif
+ let prefix .= v:operator
endif
- let prefix .= v:operator
+ call feedkeys(prefix, 'n')
endif
- call feedkeys(prefix, 'n')
call feedkeys(substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
endfunction
@@ -571,8 +577,7 @@ function! s:infer_properties(name, repo)
let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git')
let uri = printf(fmt, repo)
endif
- let dir = s:dirpath( fnamemodify(join([g:plug_home, a:name], '/'), ':p') )
- return { 'dir': dir, 'uri': uri }
+ return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri }
endif
endfunction
@@ -726,10 +731,14 @@ function! s:prepare(...)
call s:job_abort()
if s:switch_in()
- normal q
+ if b:plug_preview == 1
+ pc
+ endif
+ enew
+ else
+ call s:new_window()
endif
- call s:new_window()
nnoremap <silent> <buffer> q :if b:plug_preview==1<bar>pc<bar>endif<bar>bd<cr>
if a:0 == 0
call s:finish_bindings()
@@ -742,7 +751,7 @@ function! s:prepare(...)
for k in ['<cr>', 'L', 'o', 'X', 'd', 'dd']
execute 'silent! unmap <buffer>' k
endfor
- setlocal buftype=nofile bufhidden=wipe nobuflisted noswapfile nowrap cursorline modifiable
+ setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
setf vim-plug
if exists('g:syntax_on')
call s:syntax()
@@ -809,7 +818,15 @@ function! s:do(pull, force, todo)
if type == s:TYPE.string
if spec.do[0] == ':'
call s:load_plugin(spec)
- execute spec.do[1:]
+ try
+ execute spec.do[1:]
+ catch
+ let error = v:exception
+ endtry
+ if !s:plug_window_exists()
+ cd -
+ throw 'Warning: vim-plug was terminated by the post-update hook of '.name
+ endif
else
let error = s:bang(spec.do)
endif
@@ -936,8 +953,9 @@ function! s:update_impl(pull, force, args) abort
call s:warn('echom', '[vim-plug] Update Neovim for parallel installer')
endif
- let python = (has('python') || has('python3')) && (!s:nvim || has('vim_starting'))
- let ruby = has('ruby') && !s:nvim && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && s:check_ruby()
+ let use_job = s:nvim || s:vim8
+ let python = (has('python') || has('python3')) && !use_job
+ let ruby = has('ruby') && !use_job && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && s:check_ruby()
let s:update = {
\ 'start': reltime(),
@@ -947,7 +965,7 @@ function! s:update_impl(pull, force, args) abort
\ 'pull': a:pull,
\ 'force': a:force,
\ 'new': {},
- \ 'threads': (python || ruby || s:nvim) ? min([len(todo), threads]) : 1,
+ \ 'threads': (python || ruby || use_job) ? min([len(todo), threads]) : 1,
\ 'bar': '',
\ 'fin': 0
\ }
@@ -961,7 +979,7 @@ function! s:update_impl(pull, force, args) abort
\ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : ''
" Python version requirement (>= 2.7)
- if python && !has('python3') && !ruby && !s:nvim && s:update.threads > 1
+ if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
redir => pyv
silent python import platform; print platform.python_version()
redir END
@@ -1002,6 +1020,12 @@ function! s:update_impl(pull, force, args) abort
endtry
else
call s:update_vim()
+ while use_job && has('vim_starting')
+ sleep 100m
+ if s:update.fin
+ break
+ endif
+ endwhile
endif
endfunction
@@ -1017,7 +1041,7 @@ function! s:update_finish()
if s:switch_in()
call append(3, '- Updating ...') | 4
for [name, spec] in items(filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && (s:update.force || s:update.pull || has_key(s:update.new, v:key))'))
- let pos = s:logpos(name)
+ let [pos, _] = s:logpos(name)
if !pos
continue
endif
@@ -1059,7 +1083,13 @@ function! s:update_finish()
redraw
endfor
silent 4 d _
- call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")'))
+ try
+ call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")'))
+ catch
+ call s:warn('echom', v:exception)
+ call s:warn('echo', '')
+ return
+ endtry
call s:finish(s:update.pull)
call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.')
call s:switch_out('normal! gg')
@@ -1067,12 +1097,16 @@ function! s:update_finish()
endfunction
function! s:job_abort()
- if !s:nvim || !exists('s:jobs')
+ if (!s:nvim && !s:vim8) || !exists('s:jobs')
return
endif
for [name, j] in items(s:jobs)
- silent! call jobstop(j.jobid)
+ if s:nvim
+ 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))
endif
@@ -1080,59 +1114,88 @@ function! s:job_abort()
let s:jobs = {}
endfunction
-" When a:event == 'stdout', data = list of strings
-" When a:event == 'exit', data = returncode
-function! s:job_handler(job_id, data, event) abort
+function! s:last_non_empty_line(lines)
+ let len = len(a:lines)
+ for idx in range(len)
+ let line = a:lines[len-idx-1]
+ if !empty(line)
+ return line
+ endif
+ endfor
+ return ''
+endfunction
+
+function! s:job_out_cb(self, data) abort
+ let self = a:self
+ let data = remove(self.lines, -1) . a:data
+ let lines = map(split(data, "\n", 1), 'split(v:val, "\r", 1)[-1]')
+ call extend(self.lines, lines)
+ " To reduce the number of buffer updates
+ let self.tick = get(self, 'tick', -1) + 1
+ if !self.running || self.tick % len(s:jobs) == 0
+ let bullet = self.running ? (self.new ? '+' : '*') : (self.error ? 'x' : '-')
+ let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines)
+ call s:log(bullet, self.name, result)
+ endif
+endfunction
+
+function! s:job_exit_cb(self, data) abort
+ let a:self.running = 0
+ let a:self.error = a:data != 0
+ call s:reap(a:self.name)
+ call s:tick()
+endfunction
+
+function! s:job_cb(fn, job, ch, data)
if !s:plug_window_exists() " plug window closed
return s:job_abort()
endif
+ call call(a:fn, [a:job, a:data])
+endfunction
- if a:event == 'stdout'
- let complete = empty(a:data[-1])
- let lines = map(filter(a:data, 'v:val =~ "[^\r\n]"'), 'split(v:val, "[\r\n]")[-1]')
- call extend(self.lines, lines)
- let self.result = join(self.lines, "\n")
- if !complete
- call remove(self.lines, -1)
- endif
- " To reduce the number of buffer updates
- let self.tick = get(self, 'tick', -1) + 1
- if self.tick % len(s:jobs) == 0
- call s:log(self.new ? '+' : '*', self.name, self.result)
- endif
- elseif a:event == 'exit'
- let self.running = 0
- if a:data != 0
- let self.error = 1
- endif
- call s:reap(self.name)
- call s:tick()
- endif
+function! s:nvim_cb(job_id, data, event) abort
+ return a:event == 'stdout' ?
+ \ s:job_cb('s:job_out_cb', self, 0, join(a:data, "\n")) :
+ \ 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': [], 'result': '',
- \ 'new': get(a:opts, 'new', 0),
- \ 'on_stdout': function('s:job_handler'),
- \ 'on_exit' : function('s:job_handler'),
- \ }
+ let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''],
+ \ 'new': get(a:opts, 'new', 0) }
let s:jobs[a:name] = job
+ let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'],
+ \ has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd)
if s:nvim
- let argv = [ 'sh', '-c',
- \ (has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd) ]
+ call extend(job, {
+ \ 'on_stdout': function('s:nvim_cb'),
+ \ 'on_exit': function('s:nvim_cb'),
+ \ })
let jid = jobstart(argv, job)
if jid > 0
let job.jobid = jid
else
let job.running = 0
let job.error = 1
- let job.result = jid < 0 ? 'sh is not executable' :
- \ 'Invalid arguments (or job table is full)'
+ let job.lines = [jid < 0 ? argv[0].' is not executable' :
+ \ 'Invalid arguments (or job table is full)']
+ endif
+ elseif s:vim8
+ let jid = job_start(argv, {
+ \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]),
+ \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]),
+ \ 'out_mode': 'raw'
+ \})
+ if job_status(jid) == 'run'
+ let job.jobid = jid
+ else
+ let job.running = 0
+ let job.error = 1
+ let job.lines = ['Failed to start job']
endif
else
let params = has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd]
- let job.result = call('s:system', params)
+ let job.lines = s:lines(call('s:system', params))
let job.error = v:shell_error != 0
let job.running = 0
endif
@@ -1147,7 +1210,9 @@ function! s:reap(name)
endif
let s:update.bar .= job.error ? 'x' : '='
- call s:log(job.error ? 'x' : '-', a:name, empty(job.result) ? 'OK' : job.result)
+ 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()
call remove(s:jobs, a:name)
@@ -1166,23 +1231,31 @@ endfunction
function! s:logpos(name)
for i in range(4, line('$'))
if getline(i) =~# '^[-+x*] '.a:name.':'
- return i
+ for j in range(i + 1, line('$'))
+ if getline(j) !~ '^ '
+ return [i, j - 1]
+ endif
+ endfor
+ return [i, i]
endif
endfor
+ return [0, 0]
endfunction
function! s:log(bullet, name, lines)
if s:switch_in()
- let pos = s:logpos(a:name)
- if pos > 0
- silent execute pos 'd _'
- if pos > winheight('.')
- let pos = 4
+ let [b, e] = s:logpos(a:name)
+ if b > 0
+ silent execute printf('%d,%d d _', b, e)
+ if b > winheight('.')
+ let b = 4
endif
else
- let pos = 4
+ let b = 4
endif
- call append(pos - 1, s:format_message(a:bullet, a:name, a:lines))
+ " FIXME For some reason, nomodifiable is set after :d in vim8
+ setlocal modifiable
+ call append(b - 1, s:format_message(a:bullet, a:name, a:lines))
call s:switch_out()
endif
endfunction
@@ -1196,12 +1269,12 @@ endfunction
function! s:tick()
let pull = s:update.pull
- let prog = s:progress_opt(s:nvim)
+ let prog = s:progress_opt(s:nvim || s:vim8)
while 1 " Without TCO, Vim stack is bound to explode
if empty(s:update.todo)
if empty(s:jobs) && !s:update.fin
- let s:update.fin = 1
call s:update_finish()
+ let s:update.fin = 1
endif
return
endif
@@ -1221,10 +1294,10 @@ while 1 " Without TCO, Vim stack is bound to explode
let fetch_opt = (has_tag && !empty(globpath(spec.dir, '.git/shallow'))) ? '--depth 99999999' : ''
call s:spawn(name, printf('git fetch %s %s 2>&1', fetch_opt, prog), { 'dir': spec.dir })
else
- let s:jobs[name] = { 'running': 0, 'result': 'Already installed', 'error': 0 }
+ let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 }
endif
else
- let s:jobs[name] = { 'running': 0, 'result': error, 'error': 1 }
+ let s:jobs[name] = { 'running': 0, 'lines': s:lines(error), 'error': 1 }
endif
else
call s:spawn(name,
@@ -1510,10 +1583,12 @@ class Plugin(object):
return result[-1]
def update(self):
- match = re.compile(r'git::?@')
- actual_uri = re.sub(match, '', self.repo_uri())
- expect_uri = re.sub(match, '', self.args['uri'])
- if actual_uri != expect_uri:
+ actual_uri = self.repo_uri()
+ expect_uri = self.args['uri']
+ regex = re.compile(r'^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$')
+ ma = regex.match(actual_uri)
+ mb = regex.match(expect_uri)
+ if ma is None or mb is None or ma.groups() != mb.groups():
msg = ['',
'Invalid URI: {0}'.format(actual_uri),
'Expected {0}'.format(expect_uri),
@@ -1672,6 +1747,11 @@ function! s:update_ruby()
end
end
+ def compare_git_uri a, b
+ regex = %r{^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$}
+ regex.match(a).to_a.drop(1) == regex.match(b).to_a.drop(1)
+ end
+
require 'thread'
require 'fileutils'
require 'timeout'
@@ -1773,9 +1853,8 @@ function! s:update_ruby()
main = Thread.current
threads = []
watcher = Thread.new {
- while VIM::evaluate('getchar(1)')
- sleep 0.1
- end
+ require 'io/console' # >= Ruby 1.9
+ nil until IO.console.getch == 3.chr
mtx.synchronize do
running = false
threads.each { |t| t.raise Interrupt }
@@ -1813,7 +1892,7 @@ function! s:update_ruby()
else
[false, [data.chomp, "PlugClean required."].join($/)]
end
- elsif current_uri.sub(/git::?@/, '') != uri.sub(/git::?@/, '')
+ elsif !compare_git_uri(current_uri, uri)
[false, ["Invalid URI: #{current_uri}",
"Expected: #{uri}",
"PlugClean required."].join($/)]
@@ -1859,9 +1938,15 @@ function! s:progress_bar(line, bar, total)
endfunction
function! s:compare_git_uri(a, b)
- let a = substitute(a:a, 'git:\{1,2}@', '', '')
- let b = substitute(a:b, 'git:\{1,2}@', '', '')
- return a ==# b
+ " See `git help clone'
+ " https:// [user@] github.com[:port] / junegunn/vim-plug [.git]
+ " [git@] github.com[:port] : junegunn/vim-plug [.git]
+ " file:// / junegunn/vim-plug [/]
+ " / junegunn/vim-plug [/]
+ let pat = '^\%(\w\+://\)\='.'\%([^@/]*@\)\='.'\([^:/]*\%(:[0-9]*\)\=\)'.'[:/]'.'\(.\{-}\)'.'\%(\.git\)\=/\?$'
+ let ma = matchlist(a:a, pat)
+ let mb = matchlist(a:b, pat)
+ return ma[1:2] ==# mb[1:2]
endfunction
function! s:format_message(bullet, name, message)