mrckndt/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Activity

plug upgrade

Browse Source
This commit is contained in:
Marco
2025-05-30 16:28:05 +02:00
parent 06169eba37
commit 4570331420
1 changed files with 86 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
neovim/.config/nvim/autoload/plug.vim
View File

@@ -1,67 +1,36 @@
" vim-plug: Vim plugin manager " 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 \ " curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
" https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim " 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() " 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 " MIT License
" "
@@ -403,8 +372,10 @@ function! plug#end()
for [cmd, names] in items(lod.cmd) for [cmd, names] in items(lod.cmd)
execute printf( 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 endfor
for [map, names] in items(lod.map) for [map, names] in items(lod.map)
@@ -682,11 +653,19 @@ function! s:lod_ft(pat, names)
call s:doautocmd('filetypeindent', 'FileType') call s:doautocmd('filetypeindent', 'FileType')
endfunction 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) function! s:lod_map(map, names, with_prefix, prefix)
call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
@@ -814,10 +793,11 @@ endfunction
function! s:syntax() function! s:syntax()
syntax clear syntax clear
syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber 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 plugNumber /[0-9]\+[0-9.]*/ contained
syn match plugBracket /[[\]]/ contained syn match plugBracket /[[\]]/ contained
syn match plugX /x/ contained syn match plugX /x/ contained
syn match plugAbort /\~/ contained
syn match plugDash /^-\{1}\ / syn match plugDash /^-\{1}\ /
syn match plugPlus /^+/ syn match plugPlus /^+/
syn match plugStar /^*/ syn match plugStar /^*/
@@ -842,6 +822,7 @@ function! s:syntax()
hi def link plug2 Repeat hi def link plug2 Repeat
hi def link plugH2 Type hi def link plugH2 Type
hi def link plugX Exception hi def link plugX Exception
hi def link plugAbort Ignore
hi def link plugBracket Structure hi def link plugBracket Structure
hi def link plugNumber Number hi def link plugNumber Number
@@ -939,7 +920,7 @@ function! s:prepare(...)
endif endif
endfor endfor
call s:job_abort() call s:job_abort(0)
if s:switch_in() if s:switch_in()
if b:plug_preview == 1 if b:plug_preview == 1
pc pc
@@ -975,6 +956,8 @@ function! s:close_pane()
if b:plug_preview == 1 if b:plug_preview == 1
pc pc
let b:plug_preview = -1 let b:plug_preview = -1
elseif exists('s:jobs') && !empty(s:jobs)
call s:job_abort(1)
else else
bd bd
endif endif
@@ -1102,12 +1085,16 @@ function! s:hash_match(a, b)
return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0 return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0
endfunction endfunction
function! s:disable_credential_helper()
return s:git_version_requirement(2) && get(g:, 'plug_disable_credential_helper', 1)
endfunction
function! s:checkout(spec) function! s:checkout(spec)
let sha = a:spec.commit let sha = a:spec.commit
let output = s:git_revision(a:spec.dir) let output = s:git_revision(a:spec.dir)
let error = 0 let error = 0
if !empty(output) && !s:hash_match(sha, s:lines(output)[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( let output = s:system(
\ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) \ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir)
let error = v:shell_error let error = v:shell_error
@@ -1357,7 +1344,12 @@ function! s:update_finish()
endif endif
endfunction 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') if (!s:nvim && !s:vim8) || !exists('s:jobs')
return return
endif endif
@@ -1371,8 +1363,18 @@ function! s:job_abort()
if j.new if j.new
call s:rm_rf(g:plugs[name].dir) call s:rm_rf(g:plugs[name].dir)
endif endif
if a:cancel
call s:mark_aborted(name, 'Aborted')
endif
endfor 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 endfunction
function! s:last_non_empty_line(lines) function! s:last_non_empty_line(lines)
@@ -1386,6 +1388,16 @@ function! s:last_non_empty_line(lines)
return '' return ''
endfunction 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 function! s:job_out_cb(self, data) abort
let self = a:self let self = a:self
let data = remove(self.lines, -1) . a:data let data = remove(self.lines, -1) . a:data
@@ -1394,10 +1406,9 @@ function! s:job_out_cb(self, data) abort
" To reduce the number of buffer updates " To reduce the number of buffer updates
let self.tick = get(self, 'tick', -1) + 1 let self.tick = get(self, 'tick', -1) + 1
if !self.running || self.tick % len(s:jobs) == 0 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) let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines)
if len(result) if len(result)
call s:log(bullet, self.name, result) call s:log(s:bullet_for(self), self.name, result)
endif endif
endif endif
endfunction endfunction
@@ -1411,7 +1422,7 @@ endfunction
function! s:job_cb(fn, job, ch, data) function! s:job_cb(fn, job, ch, data)
if !s:plug_window_exists() " plug window closed if !s:plug_window_exists() " plug window closed
return s:job_abort() return s:job_abort(0)
endif endif
call call(a:fn, [a:job, a:data]) call call(a:fn, [a:job, a:data])
endfunction endfunction
@@ -1483,17 +1494,16 @@ function! s:reap(name)
endif endif
let more = len(get(job, 'queue', [])) 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) let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines)
if len(result) if len(result)
call s:log(bullet, a:name, result) call s:log(s:bullet_for(job), a:name, result)
endif endif
if !job.error && more if !job.error && more
let job.spec.queue = job.queue let job.spec.queue = job.queue
let s:update.todo[a:name] = job.spec let s:update.todo[a:name] = job.spec
else else
let s:update.bar .= job.error ? 'x' : '=' let s:update.bar .= s:bullet_for(job, '=')
call s:bar() call s:bar()
endif endif
endfunction endfunction
@@ -1572,6 +1582,12 @@ while 1 " Without TCO, Vim stack is bound to explode
let name = keys(s:update.todo)[0] let name = keys(s:update.todo)[0]
let spec = remove(s:update.todo, name) 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 queue = get(spec, 'queue', [])
let new = empty(globpath(spec.dir, '.git', 1)) let new = empty(globpath(spec.dir, '.git', 1))
@@ -1587,7 +1603,7 @@ while 1 " Without TCO, Vim stack is bound to explode
let [error, _] = s:git_validate(spec, 0) let [error, _] = s:git_validate(spec, 0)
if empty(error) if empty(error)
if pull 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')) if has_tag && !empty(globpath(spec.dir, '.git/shallow'))
call extend(cmd, ['--depth', '99999999']) call extend(cmd, ['--depth', '99999999'])
endif endif
@@ -2312,7 +2328,10 @@ endfunction
function! s:with_cd(cmd, dir, ...) function! s:with_cd(cmd, dir, ...)
let script = a:0 > 0 ? a:1 : 1 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 endfunction
function! s:system(cmd, ...) function! s:system(cmd, ...)