VimPlug/fzf.vim
1
0
Fork 0
mirror of https://github.com/junegunn/fzf.vim.git synced 2025-12-06 20:54:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update display format of Maps and <plug>(fzf-maps-*)

Browse Source
This commit is contained in:
Junegunn Choi
2015-10-08 03:12:18 +09:00
parent 8fdbcb59ef
commit 3ac2d53bc1
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
autoload/fzf/vim.vim
View File

@@ -43,7 +43,7 @@ function! s:ansi(str, col, bold)
return printf("\x1b[%s%sm%s\x1b[m", a:col, a:bold ? ';1' : '', a:str) return printf("\x1b[%s%sm%s\x1b[m", a:col, a:bold ? ';1' : '', a:str)
endfunction endfunction
for [s:c, s:a] in items({'red': 31, 'green': 32, 'yellow': 33, 'blue': 34, 'magenta': 35, 'cyan': 36}) for [s:c, s:a] in items({'black': 30, 'red': 31, 'green': 32, 'yellow': 33, 'blue': 34, 'magenta': 35, 'cyan': 36})
execute "function! s:".s:c."(str, ...)\n" execute "function! s:".s:c."(str, ...)\n"
\ " return s:ansi(a:str, ".s:a.", get(a:, 1, 0))\n" \ " return s:ansi(a:str, ".s:a.", get(a:, 1, 0))\n"
\ "endfunction" \ "endfunction"
@@ -721,8 +721,9 @@ function! s:align_pairs(list)
let match = matchlist(elem, '^\(\S*\)\s*\(.*\)$') let match = matchlist(elem, '^\(\S*\)\s*\(.*\)$')
let [_, k, v] = match[0:2] let [_, k, v] = match[0:2]
let maxlen = max([maxlen, len(k)]) let maxlen = max([maxlen, len(k)])
call add(pairs, [k, v]) call add(pairs, [k, substitute(v, '^[@* ]*', '', '')])
endfor endfor
let maxlen = min([maxlen, 35])
return map(pairs, "printf('%-'.maxlen.'s', v:val[0]).' '.v:val[1]") return map(pairs, "printf('%-'.maxlen.'s', v:val[0]).' '.v:val[1]")
endfunction endfunction
@@ -747,17 +748,32 @@ function! fzf#vim#maps(mode, ...)
let s:map_cnt = v:count == 0 ? '' : v:count let s:map_cnt = v:count == 0 ? '' : v:count
let s:map_reg = empty(v:register) ? '' : ("\<plug>(-fzf-vim-dq)".v:register) let s:map_reg = empty(v:register) ? '' : ("\<plug>(-fzf-vim-dq)".v:register)
let s:map_op = a:mode == 'o' ? v:operator : '' let s:map_op = a:mode == 'o' ? v:operator : ''
redir => cout redir => cout
silent execute a:mode.'map' silent execute 'verbose' a:mode.'map'
redir END redir END
let list = map(split(cout, "\n"), 'v:val[3:]') let list = []
let aligned = s:align_pairs(map(split(cout, "\n"), 'v:val[3:]')) let curr = ''
for line in split(cout, "\n")
let src = matchstr(line, 'Last set from \zs.*')
if empty(src)
let curr = line[3:]
else
let src = ' '.join(reverse(reverse(split(src, '/'))[0:2]), '/')
call add(list, printf('%s %s', curr, s:black(src)))
let curr = ''
endif
endfor
if !empty(curr)
call add(list, curr)
endif
let aligned = s:align_pairs(list)
let sorted = sort(aligned) let sorted = sort(aligned)
let colored = map(sorted, 's:highlight_keys(v:val)') let colored = map(sorted, 's:highlight_keys(v:val)')
call s:fzf({ call s:fzf({
\ 'source': colored, \ 'source': colored,
\ 'sink': function('s:key_sink'), \ 'sink': function('s:key_sink'),
\ 'options': '--ansi --no-hscroll --nth 1,..'}, a:000) \ 'options': '--prompt "Maps> " --ansi --no-hscroll --nth 1,..'}, a:000)
endfunction endfunction
" ---------------------------------------------------------------------------- " ----------------------------------------------------------------------------