VimPlug/fzf.vim
1
0
Fork 0
mirror of https://github.com/junegunn/fzf.vim.git synced 2026-01-30 22:55:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use default layout when no optional dictionary argument is given

Browse Source
This commit is contained in:
Junegunn Choi
2016-05-17 22:38:06 +09:00
parent 78c3d254ae
commit a3c6a3629f
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
autoload/fzf/vim.vim
View File

@@ -33,6 +33,10 @@ function! fzf#vim#wrap(opts)
\ 'sink*': get(a:opts, 'sink*', s:function('s:common_sink'))})
endfunction
function! fzf#vim#layout(...)
return (a:0 && a:1) ? {} : copy(get(g:, 'fzf_layout', g:fzf#vim#default_layout))
endfunction
function! s:strip(str)
return substitute(a:str, '^\s*\|\s*$', '', 'g')
endfunction
@@ -93,7 +97,7 @@ function! s:defaults()
endfunction
function! s:fzf(opts, extra)
let extra = copy(get(a:extra, 0, {}))
let extra = empty(a:extra) ? fzf#vim#layout() : a:extra[0]
let eopts = has_key(extra, 'options') ? remove(extra, 'options') : ''
let merged = extend(copy(a:opts), extra)
let merged.options = join(filter([s:defaults(), get(merged, 'options', ''), eopts], '!empty(v:val)'))

44
plugin/fzf.vim
View File

@@ -26,10 +26,6 @@ set cpo&vim
let g:fzf#vim#default_layout = {'down': '~40%'}
function! s:w(bang)
return a:bang ? {} : copy(get(g:, 'fzf_layout', g:fzf#vim#default_layout))
endfunction
function! s:defs(commands)
let prefix = get(g:, 'fzf_command_prefix', '')
if prefix =~# '^[^A-Z]'
@@ -42,30 +38,30 @@ function! s:defs(commands)
endfunction
call s:defs([
\'command! -bang -nargs=? -complete=dir Files call fzf#vim#files(<q-args>, s:w(<bang>0))',
\'command! -bang -nargs=? GitFiles call fzf#vim#gitfiles(<q-args>, s:w(<bang>0))',
\'command! -bang Buffers call fzf#vim#buffers(s:w(<bang>0))',
\'command! -bang -nargs=* Lines call fzf#vim#lines(<q-args>, s:w(<bang>0))',
\'command! -bang -nargs=* BLines call fzf#vim#buffer_lines(<q-args>, s:w(<bang>0))',
\'command! -bang Colors call fzf#vim#colors(s:w(<bang>0))',
\'command! -bang -nargs=1 -complete=dir Locate call fzf#vim#locate(<q-args>, s:w(<bang>0))',
\'command! -bang -nargs=* Ag call fzf#vim#ag(<q-args>, s:w(<bang>0))',
\'command! -bang -nargs=* Tags call fzf#vim#tags(<q-args>, s:w(<bang>0))',
\'command! -bang -nargs=* BTags call fzf#vim#buffer_tags(<q-args>, s:w(<bang>0))',
\'command! -bang Snippets call fzf#vim#snippets(s:w(<bang>0))',
\'command! -bang Commands call fzf#vim#commands(s:w(<bang>0))',
\'command! -bang Marks call fzf#vim#marks(s:w(<bang>0))',
\'command! -bang Helptags call fzf#vim#helptags(s:w(<bang>0))',
\'command! -bang Windows call fzf#vim#windows(s:w(<bang>0))',
\'command! -bang Commits call fzf#vim#commits(s:w(<bang>0))',
\'command! -bang BCommits call fzf#vim#buffer_commits(s:w(<bang>0))',
\'command! -bang Maps call fzf#vim#maps("n", s:w(<bang>0))',
\'command! -bang Filetypes call fzf#vim#filetypes(s:w(<bang>0))',
\'command! -bang -nargs=? -complete=dir Files call fzf#vim#files(<q-args>, fzf#vim#layout(<bang>0))',
\'command! -bang -nargs=? GitFiles call fzf#vim#gitfiles(<q-args>, fzf#vim#layout(<bang>0))',
\'command! -bang Buffers call fzf#vim#buffers(fzf#vim#layout(<bang>0))',
\'command! -bang -nargs=* Lines call fzf#vim#lines(<q-args>, fzf#vim#layout(<bang>0))',
\'command! -bang -nargs=* BLines call fzf#vim#buffer_lines(<q-args>, fzf#vim#layout(<bang>0))',
\'command! -bang Colors call fzf#vim#colors(fzf#vim#layout(<bang>0))',
\'command! -bang -nargs=1 -complete=dir Locate call fzf#vim#locate(<q-args>, fzf#vim#layout(<bang>0))',
\'command! -bang -nargs=* Ag call fzf#vim#ag(<q-args>, fzf#vim#layout(<bang>0))',
\'command! -bang -nargs=* Tags call fzf#vim#tags(<q-args>, fzf#vim#layout(<bang>0))',
\'command! -bang -nargs=* BTags call fzf#vim#buffer_tags(<q-args>, fzf#vim#layout(<bang>0))',
\'command! -bang Snippets call fzf#vim#snippets(fzf#vim#layout(<bang>0))',
\'command! -bang Commands call fzf#vim#commands(fzf#vim#layout(<bang>0))',
\'command! -bang Marks call fzf#vim#marks(fzf#vim#layout(<bang>0))',
\'command! -bang Helptags call fzf#vim#helptags(fzf#vim#layout(<bang>0))',
\'command! -bang Windows call fzf#vim#windows(fzf#vim#layout(<bang>0))',
\'command! -bang Commits call fzf#vim#commits(fzf#vim#layout(<bang>0))',
\'command! -bang BCommits call fzf#vim#buffer_commits(fzf#vim#layout(<bang>0))',
\'command! -bang Maps call fzf#vim#maps("n", fzf#vim#layout(<bang>0))',
\'command! -bang Filetypes call fzf#vim#filetypes(fzf#vim#layout(<bang>0))',
\'command! -bang -nargs=* History call s:history(<q-args>, <bang>0)'])
function! s:history(arg, bang)
let bang = a:bang || a:arg[len(a:arg)-1] == '!'
let ext = s:w(bang)
let ext = fzf#vim#layout(bang)
if a:arg[0] == ':'
call fzf#vim#command_history(ext)
elseif a:arg[0] == '/'