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

improve s:expand()

Browse Source
This commit is contained in:
itchyny
2013-09-29 11:20:59 +09:00
parent a9195b4446
commit 0c2b7dd981
1 changed files with 18 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
autoload/lightline.vim
View File

@@ -3,7 +3,7 @@
" Version: 0.0 " Version: 0.0
" Author: itchyny " Author: itchyny
" License: MIT License " License: MIT License
" Last Change: 2013/09/24 02:12:21. " Last Change: 2013/09/29 11:19:44.
" ============================================================================= " =============================================================================
let s:save_cpo = &cpo let s:save_cpo = &cpo
@@ -224,56 +224,31 @@ function! s:expand(x)
for j in range(len(a:x[i])) for j in range(len(a:x[i]))
if has_key(e, a:x[i][j]) if has_key(e, a:x[i][j])
try try
unlet! r
let r = exists('*'.e[a:x[i][j]]) ? eval(e[a:x[i][j]] . '()') : '' let r = exists('*'.e[a:x[i][j]]) ? eval(e[a:x[i][j]] . '()') : ''
if type(r) == 1 && r == '' | continue | endif if type(r) == 1 && r == '' | continue | endif
let s = type(r) == 1 ? [[], [r], []] : type(r) == 3 ? r : [[], [string(r)], []] let s = type(r) == 3 ? (len(r) < 3 ? r + [[], [], []] : r) : [[], [r], []]
if len(s) < 3 | call extend(s, [[], [], []]) | endif
unlet r
catch catch
continue continue
endtry endtry
call map(s, 'type(v:val)==3?filter(map(v:val,"type(v:val)==1?(v:val):string(v:val)"),"strlen(v:val)"):type(v:val)==1?(strlen(v:val)?[v:val]:[]):[string(v:val)]') for k in [0, 1, 2]
if len(s[0]) 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(a) || type(a[-1]) != type(i) || a[-1] != i if len(sk)
unlet! m
let m = k == 1 && has_key(t, a:x[i][j]) ? t[a:x[i][j]] : i
if !len(a) || type(a[-1]) != type(m) || a[-1] != m
if len(_[-1]) if len(_[-1])
call add(_, s[0]) | call add(c, repeat([1], len(s[0]))) call add(_, sk) | call add(c, repeat([1], len(sk)))
else else
call extend(_[-1], s[0]) | call extend(c[-1], repeat([1], len(s[0]))) call extend(_[-1], sk) | call extend(c[-1], repeat([1], len(sk)))
endif endif
call add(a, i) call add(a, m)
else else
call extend(_[-1], s[0]) | call extend(c[-1], repeat([1], len(s[0]))) if len(_) > 1 && !len(_[-1]) | call remove(_, -1) | call remove(c, -1) | endif
call extend(_[-1], sk) | call extend(c[-1], repeat([1], len(sk)))
endif endif
endif endif
if has_key(t, a:x[i][j]) endfor
if len(s[1])
if len(_[-1])
call add(_, s[1]) | call add(c, repeat([1], len(s[1])))
else
call extend(_[-1], s[1]) | call extend(c[-1], repeat([1], len(s[1])))
endif
call add(a, t[a:x[i][j]])
endif
if len(s[2])
if len(_[-1]) && (type(a[-1]) != type(i) || a[-1] != i)
call add(_, s[2]) | call add(c, repeat([1], len(s[2]))) | call add(a, i)
else
call extend(_[-1], s[2]) | call extend(c[-1], repeat([1], len(s[2])))
endif
endif
else
if !len(a) || type(a[-1]) != type(i) || a[-1] != i
call add(a, i)
if len(_[-1])
call add(_, s[1]) | call add(c, repeat([1], len(s[1])))
else
call extend(_[-1], s[1]) | call extend(c[-1], repeat([1], len(s[1])))
endif
else
call extend(_[-1], s[1]) | call extend(c[-1], repeat([1], len(s[1])))
endif
if len(s[2]) | call extend(_[-1], s[2]) | call extend(c[-1], repeat([1], len(s[2])))| endif
endif
elseif has_key(d, a:x[i][j]) || has_key(f, a:x[i][j]) elseif has_key(d, a:x[i][j]) || has_key(f, a:x[i][j])
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)