1
0
mirror of https://github.com/amix/vimrc synced 2025-07-10 11:44:59 +08:00

Updated plugins

This commit is contained in:
Amir
2022-08-08 15:45:56 +02:00
parent b41536726f
commit 765adb9da3
216 changed files with 4784 additions and 2112 deletions

View File

@ -95,7 +95,7 @@ let [s:pref, s:bpref, s:opts, s:new_opts, s:lc_opts] =
\ 'brief_prompt': ['s:brfprt', 0],
\ 'match_current_file': ['s:matchcrfile', 0],
\ 'match_natural_name': ['s:matchnatural', 0],
\ 'compare_lim': ['s:compare_lim', 3000],
\ 'compare_lim': ['s:compare_lim', 0],
\ 'bufname_mod': ['s:bufname_mod', ':t'],
\ 'bufpath_mod': ['s:bufpath_mod', ':~:.:h'],
\ 'formatline_func': ['s:flfunc', 's:formatline(v:val)'],
@ -330,7 +330,11 @@ fu! s:Open()
endf
fu! s:Close()
cal s:async_glob_abort()
if has('patch-9.0.0115') && exists('s:cmdheight')
let &cmdheight = s:cmdheight
unlet s:cmdheight
en
cal s:async_glob_abort(0)
cal s:buffunc(0)
if winnr('$') == 1
bw!
@ -396,7 +400,7 @@ fu! ctrlp#files()
en
" Remove base directory
cal ctrlp#rmbasedir(g:ctrlp_allfiles)
if len(g:ctrlp_allfiles) <= s:compare_lim
if !s:compare_lim || len(g:ctrlp_allfiles) <= s:compare_lim
cal sort(g:ctrlp_allfiles, 'ctrlp#complen')
en
cal s:writecache(cafile)
@ -425,13 +429,17 @@ fu! s:CloseCustomFuncs()
en
endf
if has('patch-8.2-0995')
if has('patch-8.2-0995') && get(g:, 'ctrlp_use_readdir', 1)
fu! s:GlobPath(dirs, depth)
let entries = []
for e in split(a:dirs, ',')
sil let files = readdir(e, '1', {'sort': 'none'})
if !s:showhidden | cal filter(files, 'v:val[0] != "."') | en
let entries += map(files, 'e.s:lash.v:val')
let dirs = substitute(a:dirs, '\\\([%# ]\)', '\1', 'g')
for e in split(dirs, ',')
try
let files = readdir(e, '1', {'sort': 'none'})
if !s:showhidden | cal filter(files, 'v:val[0] != "."') | en
let entries += map(files, 'e.s:lash.v:val')
cat
endt
endfo
let [dnf, depth] = [ctrlp#dirnfile(entries), a:depth + 1]
if &wig != '' | cal filter(dnf[1], 'glob(v:val) != ""') | en
@ -487,10 +495,12 @@ fu! s:async_glob_on_exit(...)
en
endf
fu! s:async_glob_abort()
fu! s:async_glob_abort(upd)
cal s:stop_job_if_exists()
cal s:stop_timer_if_exists()
cal s:ForceUpdate()
if a:upd
cal s:ForceUpdate()
en
endf
fu! s:stop_timer_if_exists()
@ -750,6 +760,9 @@ fu! s:Render(lines, pat)
en
if s:mw_order == 'btt' | cal reverse(lines) | en
let s:lines = copy(lines)
if s:nolim == 0 && len(lines) > height
let lines = lines[:height-1]
en
if has('patch-8.1-0') && s:flfunc ==# 's:formatline(v:val)'
cal map(lines, function('s:formatline2', [s:curtype()]))
el
@ -1094,7 +1107,7 @@ fu! s:MapSpecs()
if !( exists('s:smapped') && s:smapped == s:bufnr )
" Correct arrow keys in terminal
if ( has('termresponse') && v:termresponse =~ "\<ESC>" )
\ || &term =~? '\vxterm|<k?vt|gnome|screen|linux|ansi|tmux|st(-[-a-z0-9]*)?(\:tc)?$'
\ || &term =~? '\vxterm|<k?vt|gnome|screen|linux|ansi|tmux|alacritty|st(-[-a-z0-9]*)?(\:tc)?$'
for each in ['\A <up>','\B <down>','\C <right>','\D <left>']
exe s:lcmap.' <esc>['.each
endfo
@ -1151,7 +1164,7 @@ fu! s:ToggleByFname()
endf
fu! s:ToggleType(dir)
cal s:async_glob_abort()
cal s:async_glob_abort(1)
let max = len(g:ctrlp_ext_vars) + len(s:coretypes) - 1
let next = s:walker(max, s:itemtype, a:dir)
cal ctrlp#setlines(next)
@ -1761,16 +1774,22 @@ fu! s:formatline2(ct, key, str)
let str .= printf(' %s', parts[3])
en
en
retu s:lineprefix.str
en
let cond = a:ct != 'buf' &&s:ispath && ( s:winw - 4 ) < s:strwidth(str)
let cond = s:ispath && ( s:winw - 4 ) < strchars(str)
retu s:lineprefix.( cond ? s:pathshorten(str) : str )
endf
fu! s:pathshorten(str)
retu matchstr(a:str, '^.\{9}').'...'
\ .matchstr(a:str, '.\{'.( s:winw - 16 ).'}$')
endf
if exists('*strchars') && exists('*strcharpart')
fu! s:pathshorten(str)
retu strcharpart(a:str, 0, 9).'...'.strcharpart(a:str, strchars(a:str) - s:winw + 16)
endf
el
fu! s:pathshorten(str)
retu matchstr(a:str, '^.\{9}').'...'
\ .matchstr(a:str, '.\{'.( s:winw - 16 ).'}$')
endf
en
fu! s:offset(lines, height)
let s:offset = s:mw_order == 'btt' ? ( a:height - s:res_count ) : 0
@ -2713,6 +2732,15 @@ fu! ctrlp#nosy()
retu !( has('syntax') && exists('g:syntax_on') )
endf
fu! s:hiupdate()
for [ke, va] in items(s:hlgrps)
let ke = 'CtrlP' . ke
if hlexists(ke)
exe 'hi link' ke va
en
endfo
endf
fu! ctrlp#hicheck(grp, defgrp)
if !hlexists(a:grp)
exe 'hi link' a:grp a:defgrp
@ -2821,6 +2849,11 @@ fu! ctrlp#init(type, ...)
if shouldExitSingle && s:ExitIfSingleCandidate()
retu 0
en
if has('patch-9.0.0115') && &cmdheight == 0
let s:cmdheight = &cmdheight
set cmdheight=1
en
cal s:BuildPrompt(1)
if s:keyloop | cal s:KeyLoop() | en
retu 1
@ -2846,6 +2879,7 @@ if has('autocmd')
au BufEnter ControlP cal s:checkbuf()
au BufLeave ControlP noa cal s:Close()
au VimLeavePre * cal s:leavepre()
au ColorScheme * cal s:hiupdate()
aug END
en

View File

@ -203,10 +203,14 @@ endf
fu! s:parseline(line)
let vals = matchlist(a:line,
\ '\v^([^\t]+)\t(.+)\t[?/]\^?(.{-1,})\$?[?/]\;\"\t(.+)\tline(no)?\:(\d+)')
\ '\v^([^\t]+)\t(.+)\t[?/]\^?(.{-1,})\$?[?/]\;\"\t(.+)\tline(no)?\:(\d+)\t?([^\t]*)')
if vals == [] | retu '' | en
let [bufnr, bufname] = [bufnr('^'.vals[2].'$'), fnamemodify(vals[2], ':p:t')]
retu vals[1].' '.vals[4].'|'.bufnr.':'.bufname.'|'.vals[6].'| '.vals[3]
if len(vals) > 7 && vals[7] != ''
retu vals[1].' '.vals[4].'|'.bufnr.':'.bufname.'|'.vals[6].'|'.vals[7].'| '.vals[3]
else
retu vals[1].' '.vals[4].'|'.bufnr.':'.bufname.'|'.vals[6].'| '.vals[3]
en
endf
fu! s:syntax()
@ -249,7 +253,7 @@ endf
fu! ctrlp#buffertag#accept(mode, str)
let vals = matchlist(a:str,
\ '\v^[^\t]+\t+[^\t|]+\|(\d+)\:[^\t|]+\|(\d+)\|\s(.+)$')
\ '\v^[^\t]+\t+[^\t|]+\|(\d+)\:[^\t|]+\|(\d+)%(\|[^\t|]+)?\|\s(.+)$')
let bufnr = str2nr(get(vals, 1))
if bufnr
cal ctrlp#acceptfile(a:mode, bufnr)