m-vim_plugins/lightline.vim
1
0
Fork 0
mirror of https://github.com/itchyny/lightline.vim.git synced 2025-11-15 06:53:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor s:expand, s:_expand: pass the name of the component

Browse Source
This commit is contained in:
itchyny
2016-03-21 15:59:43 +09:00
parent cbed6f9a69
commit c806e08ac3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
autoload/lightline.vim
View File

@@ -2,7 +2,7 @@
" Filename: autoload/lightline.vim " Filename: autoload/lightline.vim
" Author: itchyny " Author: itchyny
" License: MIT License " License: MIT License
" Last Change: 2016/03/21 15:48:38. " Last Change: 2016/03/21 15:56:33.
" ============================================================================= " =============================================================================
let s:save_cpo = &cpo let s:save_cpo = &cpo
@@ -362,9 +362,9 @@ function! lightline#statusline(inactive) abort
return s:line(0, a:inactive) return s:line(0, a:inactive)
endfunction endfunction
function! s:_expand(a, c, _, e, t, i, j, x) abort function! s:_expand(a, c, _, e, t, i, name) abort
try try
let r = eval(a:e[a:x[a:i][a:j]] . '()') let r = eval(a:e[a:name] . '()')
if type(r) == 1 && r ==# '' if type(r) == 1 && r ==# ''
return return
endif endif
@@ -376,7 +376,7 @@ function! s:_expand(a, c, _, e, t, i, j, x) abort
let sk = filter(type(s[k])==3?map(s[k],'type(v:val)==1?(v:val):string(v:val)'):type(s[k])==1?[s[k]]:[string(s[k])],'strlen(v:val)') let sk = filter(type(s[k])==3?map(s[k],'type(v:val)==1?(v:val):string(v:val)'):type(s[k])==1?[s[k]]:[string(s[k])],'strlen(v:val)')
if len(sk) if len(sk)
unlet! m unlet! m
let m = k == 1 && has_key(a:t, a:x[a:i][a:j]) ? a:t[a:x[a:i][a:j]] : a:i let m = k == 1 && has_key(a:t, a:name) ? a:t[a:name] : a:i
if !len(a:a) || type(a:a[-1]) != type(m) || a:a[-1] != m if !len(a:a) || type(a:a[-1]) != type(m) || a:a[-1] != m
if len(a:_[-1]) if len(a:_[-1])
call add(a:_, sk) call add(a:_, sk)
@@ -406,10 +406,10 @@ function! s:expand(x) abort
call add(_, []) call add(_, [])
call add(c, []) call add(c, [])
endif endif
for j in range(len(a:x[i])) for name in a:x[i]
if has_key(e, a:x[i][j]) if has_key(e, name)
call s:_expand(a, c, _, e, t, i, j, a:x) call s:_expand(a, c, _, e, t, i, name)
elseif has_key(d, a:x[i][j]) || has_key(f, a:x[i][j]) elseif has_key(d, name) || has_key(f, name)
if !len(a) || type(a[-1]) != type(i) || a[-1] != i if !len(a) || type(a[-1]) != type(i) || a[-1] != i
call add(a, i) call add(a, i)
if len(_) && len(_[-1]) if len(_) && len(_[-1])
@@ -417,7 +417,7 @@ function! s:expand(x) abort
call add(c, []) call add(c, [])
endif endif
endif endif
call add(_[-1], a:x[i][j]) call add(_[-1], name)
call add(c[-1], 0) call add(c[-1], 0)
endif endif
endfor endfor