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

comparison .shared/.vim/autoload/plug.vim @ 304:ce9014cb4240

vim plugin update

author	Steve Huston <huston@princeton.edu>
date	Fri, 02 May 2025 16:28:10 -0400
parents	df0b24d4fabd
children

comparison

equal deleted inserted replaced

-:d29c29690818
+:ce9014cb4240
 " vim-plug: Vim plugin manager
 " ============================
 "
-" Download plug.vim and put it in ~/.vim/autoload
+" 1. Download plug.vim and put it in 'autoload' directory
 "
+"   # Vim
 "   curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
 "     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 "
-" Edit your .vimrc
+"   # Neovim
+"   sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
+"     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
 "
-"   call plug#begin('~/.vim/plugged')
+" 2. Add a vim-plug section to your ~/.vimrc (or ~/.config/nvim/init.vim for Neovim)
 "
-"   " Make sure you use single quotes
+"   call plug#begin()
 "
-"   " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align
+"   " List your plugins here
-"   Plug 'junegunn/vim-easy-align'
+"   Plug 'tpope/vim-sensible'
 "
-"   " Any valid git URL is allowed
-"   Plug 'https://github.com/junegunn/vim-github-dashboard.git'
-"
-"   " Multiple Plug commands can be written in a single line using | separators
-"   Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
-"
-"   " On-demand loading
-"   Plug 'preservim/nerdtree', { 'on': 'NERDTreeToggle' }
-"   Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
-"
-"   " Using a non-default branch
-"   Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }
-"
-"   " Using a tagged release; wildcard allowed (requires git 1.9.2 or above)
-"   Plug 'fatih/vim-go', { 'tag': '*' }
-"
-"   " Plugin options
-"   Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' }
-"
-"   " Plugin outside ~/.vim/plugged with post-update hook
-"   Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
-"
-"   " Unmanaged plugin (manually installed and updated)
-"   Plug '~/my-prototype-plugin'
-"
-"   " Initialize plugin system
 "   call plug#end()
 "
-" Then reload .vimrc and :PlugInstall to install plugins.
+" 3. Reload the file or restart Vim, then you can,
 "
-" Plug options:
+"     :PlugInstall to install plugins
+"     :PlugUpdate  to update plugins
+"     :PlugDiff    to review the changes from the last update
+"     :PlugClean   to remove plugins no longer in the list
 "
-"| Option                  | Description                                      |
+" For more information, see https://github.com/junegunn/vim-plug
-"| ----------------------- | ------------------------------------------------ |
-"| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use       |
-"| `rtp`                   | Subdirectory that contains Vim plugin            |
-"| `dir`                   | Custom directory for the plugin                  |
-"| `as`                    | Use different name for the plugin                |
-"| `do`                    | Post-update hook (string or funcref)             |
-"| `on`                    | On-demand loading: Commands or `<Plug>`-mappings |
-"| `for`                   | On-demand loading: File types                    |
-"| `frozen`                | Do not update unless explicitly specified        |
-"
-" More information: https://github.com/junegunn/vim-plug
 "
 "
-" Copyright (c) 2017 Junegunn Choi
+" Copyright (c) 2024 Junegunn Choi
 "
 " MIT License
 "
 " Permission is hereby granted, free of charge, to any person obtaining
 " a copy of this software and associated documentation files (the
 return s:plug_call('tempname')
 endfunction
 function! plug#begin(...)
 if a:0 > 0
-let s:plug_home_org = a:1
 let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p'))
 elseif exists('g:plug_home')
 let home = s:path(g:plug_home)
 elseif has('nvim')
 let home = stdpath('data') . '/plugged'
 endif
 endfor
 for [cmd, names] in items(lod.cmd)
 execute printf(
-\ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)',
+\ has('patch-7.4.1898')
-\ cmd, string(cmd), string(names))
+\ ? 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, <q-mods> ,%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
 for [map, names] in items(lod.map)
 for [mode, map_prefix, key_prefix] in
 \ [['i', '<C-\><C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
 execute 'autocmd! PlugLOD FileType' a:pat
 call s:doautocmd('filetypeplugin', 'FileType')
 call s:doautocmd('filetypeindent', 'FileType')
 endfunction
-function! s:lod_cmd(cmd, bang, l1, l2, args, names)
+if has('patch-7.4.1898')
-call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
+function! s:lod_cmd(cmd, bang, l1, l2, args, mods, names)
-call s:dobufread(a:names)
+call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
-execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
+call s:dobufread(a:names)
-endfunction
+execute printf('%s %s%s%s %s', a:mods, (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
+endfunction
+else
+function! s:lod_cmd(cmd, bang, l1, l2, args, names)
+call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
+call s:dobufread(a:names)
+execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
+endfunction
+endif
 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 = ''
 endfunction
 function! s:syntax()
 syntax clear
 syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber
-syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX
+syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX,plugAbort
 syn match plugNumber /[0-9]\+[0-9.]*/ contained
 syn match plugBracket /[[\]]/ contained
 syn match plugX /x/ contained
+syn match plugAbort /\~/ contained
 syn match plugDash /^-\{1}\ /
 syn match plugPlus /^+/
 syn match plugStar /^*/
 syn match plugMessage /\(^- \)\@<=.*/
 syn match plugName /\(^- \)\@<=[^ ]*:/
 syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean
 hi def link plug1       Title
 hi def link plug2       Repeat
 hi def link plugH2      Type
 hi def link plugX       Exception
+hi def link plugAbort   Ignore
 hi def link plugBracket Structure
 hi def link plugNumber  Number
 hi def link plugDash    Special
 hi def link plugPlus    Constant
 if exists(evar)
 throw evar.' detected. Cannot proceed.'
 endif
 endfor
-call s:job_abort()
+call s:job_abort(0)
 if s:switch_in()
 if b:plug_preview == 1
 pc
 endif
 enew
 function! s:close_pane()
 if b:plug_preview == 1
 pc
 let b:plug_preview = -1
+elseif exists('s:jobs') && !empty(s:jobs)
+call s:job_abort(1)
 else
 bd
 endif
 endfunction
 function! s:hash_match(a, b)
 return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0
 endfunction
+function! s:disable_credential_helper()
+return s:git_version_requirement(2) && get(g:, 'plug_disable_credential_helper', 1)
+endfunction
 function! s:checkout(spec)
 let sha = a:spec.commit
 let output = s:git_revision(a:spec.dir)
 let error = 0
 if !empty(output) && !s:hash_match(sha, s:lines(output)[0])
-let credential_helper = s:git_version_requirement(2) ? '-c credential.helper= ' : ''
+let credential_helper = s:disable_credential_helper() ? '-c credential.helper= ' : ''
 let output = s:system(
 \ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir)
 let error = v:shell_error
 endif
 return [output, error]
 call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.')
 call s:switch_out('normal! gg')
 endif
 endfunction
-function! s:job_abort()
+function! s:mark_aborted(name, message)
+let attrs = { 'running': 0, 'error': 1, 'abort': 1, 'lines': [a:message] }
+let s:jobs[a:name] = extend(get(s:jobs, a:name, {}), attrs)
+endfunction
+function! s:job_abort(cancel)
 if (!s:nvim && !s:vim8) || !exists('s:jobs')
 return
 endif
 for [name, j] in items(s:jobs)
 silent! call job_stop(j.jobid)
 endif
 if j.new
 call s:rm_rf(g:plugs[name].dir)
 endif
+if a:cancel
+call s:mark_aborted(name, 'Aborted')
+endif
 endfor
-let s:jobs = {}
+if a:cancel
+for todo in values(s:update.todo)
+let todo.abort = 1
+endfor
+else
+let s:jobs = {}
+endif
 endfunction
 function! s:last_non_empty_line(lines)
 let len = len(a:lines)
 for idx in range(len)
 if !empty(line)
 return line
 endif
 endfor
 return ''
+endfunction
+function! s:bullet_for(job, ...)
+if a:job.running
+return a:job.new ? '+' : '*'
+endif
+if get(a:job, 'abort', 0)
+return '~'
+endif
+return a:job.error ? 'x' : get(a:000, 0, '-')
 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)
 if len(result)
-call s:log(bullet, self.name, result)
+call s:log(s:bullet_for(self), self.name, result)
 endif
 endif
 endfunction
 function! s:job_exit_cb(self, data) abort
 call s:tick()
 endfunction
 function! s:job_cb(fn, job, ch, data)
 if !s:plug_window_exists() " plug window closed
-return s:job_abort()
+return s:job_abort(0)
 endif
 call call(a:fn, [a:job, a:data])
 endfunction
 function! s:nvim_cb(job_id, data, event) dict abort
 elseif get(job, 'new', 0)
 let s:update.new[a:name] = 1
 endif
 let more = len(get(job, 'queue', []))
-let bullet = job.error ? 'x' : more ? (job.new ? '+' : '*') : '-'
 let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines)
 if len(result)
-call s:log(bullet, a:name, result)
+call s:log(s:bullet_for(job), a:name, result)
 endif
 if !job.error && more
 let job.spec.queue = job.queue
 let s:update.todo[a:name] = job.spec
 else
-let s:update.bar .= job.error ? 'x' : '='
+let s:update.bar .= s:bullet_for(job, '=')
 call s:bar()
 endif
 endfunction
 function! s:bar()
 return
 endif
 let name = keys(s:update.todo)[0]
 let spec = remove(s:update.todo, name)
+if get(spec, 'abort', 0)
+call s:mark_aborted(name, 'Skipped')
+call s:reap(name)
+continue
+endif
 let queue = get(spec, 'queue', [])
 let new = empty(globpath(spec.dir, '.git', 1))
 if empty(queue)
 call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
 call s:spawn(name, spec, queue, { 'dir': spec.dir })
 elseif !new
 let [error, _] = s:git_validate(spec, 0)
 if empty(error)
 if pull
-let cmd = s:git_version_requirement(2) ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch']
+let cmd = s:disable_credential_helper() ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch']
 if has_tag && !empty(globpath(spec.dir, '.git/shallow'))
 call extend(cmd, ['--depth', '99999999'])
 endif
 if !empty(prog)
 call add(cmd, prog)
 endif
 endfunction
 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)
+let pwsh = s:is_powershell(&shell)
+let cd = s:is_win && !pwsh ? 'cd /d' : 'cd'
+let sep = pwsh ? ';' : '&&'
+return printf('%s %s %s %s', cd, plug#shellescape(a:dir, {'script': script, 'shell': &shell}), sep, a:cmd)
 endfunction
 function! s:system(cmd, ...)
 let batchfile = ''
 try
 " List of valid directories
 let dirs = []
 let errs = {}
 let [cnt, total] = [0, len(g:plugs)]
 for [name, spec] in items(g:plugs)
-if !s:is_managed(name)
+if !s:is_managed(name) || get(spec, 'frozen', 0)
 call add(dirs, spec.dir)
 else
 let [err, clean] = s:git_validate(spec, 1)
 if clean
 let errs[spec.dir] = s:lines(err)[0]

Mercurial > index.cgi > dotfiles

comparison .shared/.vim/autoload/plug.vim @ 304:ce9014cb4240