empathicqubit/fzf.vim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "[Lines] Use readfile() if buffer is not yet loaded"

Browse source 
This reverts commit 16ffd82a58.
This commit is contained in:
Junegunn Choi 2016-02-19 00:28:35 +09:00
parent 16ffd82a58
commit d940ab1c5a
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
autoload/fzf/vim.vim
View file

@ -194,14 +194,9 @@ function! fzf#vim#_lines(all)
let rest = [] let rest = []
let buf = bufnr('') let buf = bufnr('')
for b in s:buflisted() for b in s:buflisted()
let lines = getbufline(b, 1, "$")
if empty(lines)
let path = fnamemodify(bufname(b), ':p')
let lines = filereadable(path) ? readfile(path) : []
endif
call extend(b == buf ? cur : rest, call extend(b == buf ? cur : rest,
\ filter( \ filter(
\ map(lines, \ map(getbufline(b, 1, "$"),
\ '(!a:all && empty(v:val)) ? "" : printf("[%s]\t%s:\t%s", s:blue(b), s:yellow(v:key + 1), v:val)'), \ '(!a:all && empty(v:val)) ? "" : printf("[%s]\t%s:\t%s", s:blue(b), s:yellow(v:key + 1), v:val)'),
\ 'a:all || !empty(v:val)')) \ 'a:all || !empty(v:val)'))
endfor endfor
@ -418,7 +413,7 @@ endfunction
" query, [[ag options], options] " query, [[ag options], options]
function! fzf#vim#ag(query, ...) function! fzf#vim#ag(query, ...)
let args = copy(a:000) let args = copy(a:000)
let ag_opts = len(args) > 1 ? remove(args, 0) : get(g:, 'fzf_ag_options', '') let ag_opts = len(args) > 1 ? remove(args, 0) : ''
return s:fzf(fzf#vim#wrap({ return s:fzf(fzf#vim#wrap({
\ 'source': printf('ag --nogroup --column --color %s "%s"', \ 'source': printf('ag --nogroup --column --color %s "%s"',
\ ag_opts, \ ag_opts,