Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better relative paths handling and returning more useful values from API #103

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Better relative paths handling and returning more useful values from API #103

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e7f26c
infect: return loaded paths
Jul 30, 2013
b43d601
infect: better detect relative paths
Jul 24, 2013
b522bde
incubate: fallback to surround if nothing found
Jul 30, 2013
f9be8f5
infect: revert returned value
Aug 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 36 additions & 18 deletions autoload/pathogen.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,17 @@ endfunction
" Point of entry for basic default usage. Give a relative path to invoke
" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke
" pathogen#surround(). For backwards compatibility purposes, a full path that
" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories()
" instead.
" does not end in {} or * is given to pathogen#surround().
function! pathogen#infect(...) abort " {{{1
for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}']
if path =~# '^[^\\/]\+$'
if path !~# '[\\/]\%({}\|\*\)$' " Doesn't end with a mask '/{}' or '/*'
call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
call pathogen#incubate(path . '/{}')
elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$'
let path = path . '/{}'
endif
if path =~# '^[^\\/~]' " Doesn't start from slash or tilde => relative
call pathogen#incubate(path)
elseif path =~# '[\\/]\%({}\|\*\)$'
call pathogen#surround(path)
else
call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
call pathogen#surround(path . '/{}')
call pathogen#surround(path)
endif
endfor
call pathogen#cycle_filetype()
Expand Down Expand Up @@ -159,14 +156,15 @@ function! pathogen#surround(path) abort " {{{1
call filter(rtp, 'index(before + after, v:val) == -1')
endif
let &rtp = pathogen#join(before, rtp, after)
return &rtp
return {'before' : before, 'after' : after}
endfunction " }}}1

" Prepend all subdirectories of path to the rtp, and append all 'after'
" directories in those subdirectories. Deprecated.
function! pathogen#runtime_prepend_subdirectories(path) " {{{1
call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#surround('.string(a:path.'/{}').')')
return pathogen#surround(a:path . pathogen#separator() . '{}')
call pathogen#surround(a:path . pathogen#separator() . '{}')
return &rtp " for backwards compatibility with earlier pathogen#surround() impl
endfunction " }}}1

" For each directory in the runtime path, add a second entry with the given
Expand All @@ -182,24 +180,44 @@ function! pathogen#incubate(...) abort " {{{1
return ""
endif
let s:done_bundles .= name . "\n"
let list = []
let rtp_list = [] " full list of old and newly added runtimepath entries
" newly added entries only
let before = []
let after = []
" newly added entries for current rtp dir
let before_dir = []
let after_dir = []

for dir in pathogen#split(&rtp)
if dir =~# '\<after$'
if name =~# '{}$'
let list += filter(pathogen#glob_directories(substitute(dir,'after$',name[0:-3],'').'*'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
let after_dir = filter(
\ pathogen#glob_directories(
\ substitute(dir,'after$',name[0:-3],'').'*'.sep.'after'),
\ '!pathogen#is_disabled(v:val[0:-7])')
else
let list += [dir, substitute(dir, 'after$', '', '') . name . sep . 'after']
let after_dir = [substitute(dir, 'after$', '', '') . name . sep . 'after']
endif
let rtp_list += [dir] + after_dir
let after += after_dir
else
if name =~# '{}$'
let list += [dir] + filter(pathogen#glob_directories(dir.sep.name[0:-3].'*'), '!pathogen#is_disabled(v:val)')
let before_dir += filter(
\ pathogen#glob_directories(dir.sep.name[0:-3].'*'),
\ '!pathogen#is_disabled(v:val)')
else
let list += [dir . sep . name, dir]
let before_dir += [dir . sep . name]
endif
let rtp_list += before_dir + [dir]
let before += before_dir
endif
endfor
let &rtp = pathogen#join(pathogen#uniq(list))
return 1
" fallback to pathogen#surround() if nothing was found in runtimepath
if (a:0 && (len(before) == 0) && (len(after) == 0))
return pathogen#surround(name)
endif
let &rtp = pathogen#join(pathogen#uniq(rtp_list))
return {'before' : pathogen#uniq(before), 'after' : pathogen#uniq(after)}
endfunction " }}}1

" Deprecated alias for pathogen#incubate().
Expand Down