lauchmelder/vim-sussify
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Refactor show_{dir,files}()

Browse source
This commit is contained in:
Marco Hinz 2014-08-21 15:08:15 +02:00
parent 685f2546fd
commit aa17d6a7cb
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
autoload/startify.vim
View file

@ -297,30 +297,30 @@ function! s:show_dir(cnt) abort
let num = s:numfiles let num = s:numfiles
let entries = {} let entries = {}
let cwd = escape(getcwd(), '\') let cwd = escape(getcwd(), '\')
let files = filter(map(copy(v:oldfiles), 'resolve(fnamemodify(v:val, ":p"))'), 'match(v:val, cwd) == 0') let files = filter(map(copy(v:oldfiles), 'fnamemodify(resolve(v:val), ":p")'), 'match(v:val, cwd) == 0')
if !empty(files) if !empty(files)
if exists('s:last_message') if exists('s:last_message')
call s:print_section_header() call s:print_section_header()
endif endif
for fname in files for abs_path in files
let fullpath = resolve(fnamemodify(glob(fname), ':p')) let abs_path = glob(abs_path)
" filter duplicates, bookmarks and entries from the skiplist " filter duplicates, bookmarks and entries from the skiplist
if has_key(entries, fullpath) if has_key(entries, abs_path)
\ || !filereadable(fullpath) \ || !filereadable(abs_path)
\ || (exists('g:startify_skiplist') && s:is_in_skiplist(fullpath)) \ || (exists('g:startify_skiplist') && s:is_in_skiplist(abs_path))
\ || (exists('g:startify_bookmarks') && s:is_bookmark(fullpath)) \ || (exists('g:startify_bookmarks') && s:is_bookmark(abs_path))
continue continue
endif endif
let entries[fullpath] = 1 let entries[abs_path] = 1
let index = s:get_index_as_string(cnt) let index = s:get_index_as_string(cnt)
let display_fname = s:relative_path ? fnamemodify(glob(fname), ':.') : fnamemodify(glob(fname), ':p:~') let display_path = fnamemodify(abs_path, s:relative_path ? ':.' : ':p:~')
call append('$', ' ['. index .']'. repeat(' ', (3 - strlen(index))) . display_fname) call append('$', ' ['. index .']'. repeat(' ', (3 - strlen(index))) . display_path)
execute 'nnoremap <buffer><silent>' index ':edit' fnameescape(fname) '<bar> call <sid>check_user_options()<cr>' execute 'nnoremap <buffer><silent>' index ':edit' abs_path '<bar> call <sid>check_user_options()<cr>'
let cnt += 1 let cnt += 1
let num -= 1 let num -= 1
@ -351,22 +351,22 @@ function! s:show_files(cnt) abort
let entries = {} let entries = {}
for fname in v:oldfiles for fname in v:oldfiles
let fullpath = resolve(fnamemodify(glob(fname), ':p')) let abs_path = glob(fnamemodify(resolve(fname), ':p'))
" filter duplicates, bookmarks and entries from the skiplist " filter duplicates, bookmarks and entries from the skiplist
if has_key(entries, fullpath) if has_key(entries, abs_path)
\ || !filereadable(fullpath) \ || !filereadable(abs_path)
\ || (exists('g:startify_skiplist') && s:is_in_skiplist(fullpath)) \ || (exists('g:startify_skiplist') && s:is_in_skiplist(abs_path))
\ || (exists('g:startify_bookmarks') && s:is_bookmark(fullpath)) \ || (exists('g:startify_bookmarks') && s:is_bookmark(abs_path))
continue continue
endif endif
let entries[fullpath] = 1 let entries[abs_path] = 1
let index = s:get_index_as_string(cnt) let index = s:get_index_as_string(cnt)
let display_fname = s:relative_path ? fnamemodify(glob(fname), ':.') : fnamemodify(glob(fname), ':p:~') let display_path = fnamemodify(abs_path, s:relative_path ? ':.' : ':p:~')
call append('$', ' ['. index .']'. repeat(' ', (3 - strlen(index))) . display_fname) call append('$', ' ['. index .']'. repeat(' ', (3 - strlen(index))) . display_path)
execute 'nnoremap <buffer><silent>' index ':edit' fnameescape(fname) '<bar> call <sid>check_user_options()<cr>' execute 'nnoremap <buffer><silent>' index ':edit' abs_path '<bar> call <sid>check_user_options()<cr>'
let cnt += 1 let cnt += 1
let num -= 1 let num -= 1