diff options
Diffstat (limited to '.config/nvim/autoload')
| -rw-r--r-- | .config/nvim/autoload/pathogen.vim | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/.config/nvim/autoload/pathogen.vim b/.config/nvim/autoload/pathogen.vim index a13ae08f..59a75c14 100644 --- a/.config/nvim/autoload/pathogen.vim +++ b/.config/nvim/autoload/pathogen.vim @@ -1,6 +1,6 @@ " pathogen.vim - path option manipulation " Maintainer: Tim Pope <http://tpo.pe/> -" Version: 2.3 +" Version: 2.4 " Install in ~/.vim/autoload (or ~\vimfiles\autoload). " @@ -90,27 +90,30 @@ function! pathogen#cycle_filetype() abort endfunction " Check if a bundle is disabled. A bundle is considered disabled if its -" basename or full name is included in the list g:pathogen_disabled. +" basename or full name is included in the list g:pathogen_blacklist or the +" comma delimited environment variable $VIMBLACKLIST. function! pathogen#is_disabled(path) abort if a:path =~# '\~$' return 1 endif let sep = pathogen#slash() - let blacklist = map( + let blacklist = \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) + - \ pathogen#split($VIMBLACKLIST), - \ 'substitute(v:val, "[\\/]$", "", "")') + \ pathogen#split($VIMBLACKLIST) + if !empty(blacklist) + call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")') + endif return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1 -endfunction "}}}1 +endfunction " Prepend the given directory to the runtime path and append its corresponding " after directory. Curly braces are expanded with pathogen#expand(). function! pathogen#surround(path) abort let sep = pathogen#slash() let rtp = pathogen#split(&rtp) - let path = fnamemodify(a:path, ':p:?[\\/]\=$??') + let path = fnamemodify(a:path, ':s?[\\/]\=$??') let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)') - let after = filter(reverse(pathogen#expand(path.sep.'after')), '!pathogen#is_disabled(v:val[0:-7])') + let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])') call filter(rtp, 'index(before + after, v:val) == -1') let &rtp = pathogen#join(before, rtp, after) return &rtp @@ -128,7 +131,7 @@ function! pathogen#interpose(name) abort let list = [] for dir in pathogen#split(&rtp) if dir =~# '\<after$' - let list += reverse(filter(pathogen#expand(dir[0:-6].name.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir] + let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir] else let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)') endif @@ -171,7 +174,8 @@ endfunction " alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields " ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard " and globbed. Actual globs are preserved. -function! pathogen#expand(pattern) abort +function! pathogen#expand(pattern, ...) abort + let after = a:0 ? a:1 : '' if a:pattern =~# '{[^{}]\+}' let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1) let found = map(split(pat, ',', 1), 'pre.v:val.post') @@ -179,14 +183,16 @@ function! pathogen#expand(pattern) abort for pattern in found call extend(results, pathogen#expand(pattern)) endfor - return results elseif a:pattern =~# '{}' let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)') let post = a:pattern[strlen(pat) : -1] - return map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post') + let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post') else - return [a:pattern] + let results = [a:pattern] endif + let vf = pathogen#slash() . 'vimfiles' + call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""') + return filter(results, '!empty(v:val)') endfunction " \ on Windows unless shellslash is set, / everywhere else. @@ -202,12 +208,12 @@ endfunction function! pathogen#glob(pattern) abort let files = split(glob(a:pattern),"\n") return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")') -endfunction "}}}1 +endfunction " Like pathogen#glob(), only limit the results to directories. function! pathogen#glob_directories(pattern) abort return filter(pathogen#glob(a:pattern),'isdirectory(v:val)') -endfunction "}}}1 +endfunction " Remove duplicates from a list. function! pathogen#uniq(list) abort @@ -239,7 +245,7 @@ function! pathogen#fnameescape(string) abort endfunction " Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort "{{{1 +function! pathogen#runtime_findfile(file,count) abort let rtp = pathogen#join(1,pathogen#split(&rtp)) let file = findfile(a:file,rtp,a:count) if file ==# '' |