luisgulo/vim-plug
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add support for dictionary option argument: branch, rtp (#2)

Browse source
This commit is contained in:
Junegunn Choi 2013-09-25 15:09:41 +09:00
parent 3bf2573703
commit 87901b671c
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -36,7 +36,8 @@ call plug#begin()
Plug 'junegunn/seoul256' Plug 'junegunn/seoul256'
Plug 'junegunn/vim-easy-align' Plug 'junegunn/vim-easy-align'
" Plug 'user/repo', 'branch_or_tag' " Plug 'user/repo1', 'branch_or_tag'
" Plug 'user/repo2', { 'rtp': 'vim/plugin/dir', 'branch': 'devel' }
" Plug 'git@github.com:junegunn/vim-github-dashboard.git' " Plug 'git@github.com:junegunn/vim-github-dashboard.git'
" ... " ...

25
plug.vim
View file

@ -13,7 +13,8 @@
" "
" Plug 'junegunn/seoul256' " Plug 'junegunn/seoul256'
" Plug 'junegunn/vim-easy-align' " Plug 'junegunn/vim-easy-align'
" " Plug 'user/repo', 'branch_or_tag' " " Plug 'user/repo1', 'branch_or_tag'
" " Plug 'user/repo2', { 'rtp': 'vim/plugin/dir', 'branch': 'devel' }
" " ... " " ...
" "
" call plug#end() " call plug#end()
@ -93,9 +94,11 @@ function! plug#end()
filetype off filetype off
for plug in values(g:plugs) for plug in values(g:plugs)
let dir = plug.dir let dir = plug.dir
execute "set rtp^=".dir let rtp = dir.get(plug, 'rtp', '')
if rtp !~ '/$' | let rtp .= '/' | endif
execute "set rtp^=".rtp
if isdirectory(dir.'after') if isdirectory(dir.'after')
execute "set rtp+=".dir.'after' execute "set rtp+=".rtp.'after'
endif endif
endfor endfor
filetype plugin indent on filetype plugin indent on
@ -104,10 +107,19 @@ endfunction
function! s:add(...) function! s:add(...)
let force = a:1 let force = a:1
let opts = { 'branch': 'master' }
if a:0 == 2 if a:0 == 2
let [plugin, branch] = [a:2, 'master'] let plugin = a:2
elseif a:0 == 3 elseif a:0 == 3
let [plugin, branch] = [a:2, a:3] let plugin = a:2
if type(a:3) == 1
let opts.branch = a:3
elseif type(a:3) == 4
call extend(opts, a:3)
else
echoerr "Invalid argument type (expected: string or dictionary)"
return
endif
else else
echoerr "Invalid number of arguments (1..2)" echoerr "Invalid number of arguments (1..2)"
return return
@ -126,8 +138,9 @@ function! s:add(...)
if !force && has_key(g:plugs, name) | return | endif if !force && has_key(g:plugs, name) | return | endif
let dir = fnamemodify(join([g:plug_home, name], '/'), ':p') let dir = fnamemodify(join([g:plug_home, name], '/'), ':p')
if dir !~ '/$' | let dir .= '/' | endif
let spec = { 'dir': dir, 'uri': uri, 'branch': branch } let spec = extend(opts, { 'dir': dir, 'uri': uri })
let g:plugs[name] = spec let g:plugs[name] = spec
endfunction endfunction