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

Fix pad spacing

Browse source
This commit is contained in:
Marco Hinz 2020-10-07 01:15:47 +02:00
parent 2e610ac523
commit e18fa54e64
No known key found for this signature in database
GPG key ID: 1C980A1B657B4A4F
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
autoload/startify.vim
View file

@ -100,13 +100,13 @@ function! startify#insane_in_the_membrane(on_vimenter) abort
\ } \ }
if g:startify_enable_special if g:startify_enable_special
call append('$', [g:startify_padding_left .'[e] <empty buffer>', '']) call append('$', [s:leftpad .'[e] <empty buffer>', ''])
endif endif
call s:register(line('$')-1, 'e', 'special', 'enew', '') call s:register(line('$')-1, 'e', 'special', 'enew', '')
let b:startify.entry_number = 0 let b:startify.entry_number = 0
if filereadable('Session.vim') if filereadable('Session.vim')
call append('$', [g:startify_padding_left .'[0] '. getcwd() . s:sep .'Session.vim', '']) call append('$', [s:leftpad .'[0] '. getcwd() . s:sep .'Session.vim', ''])
call s:register(line('$')-1, '0', 'session', call s:register(line('$')-1, '0', 'session',
\ 'call startify#session_delete_buffers() | source', 'Session.vim') \ 'call startify#session_delete_buffers() | source', 'Session.vim')
let b:startify.entry_number = 1 let b:startify.entry_number = 1
@ -125,7 +125,7 @@ function! startify#insane_in_the_membrane(on_vimenter) abort
silent $delete _ silent $delete _
if g:startify_enable_special if g:startify_enable_special
call append('$', ['', g:startify_padding_left .'[q] <quit>']) call append('$', ['', s:leftpad .'[q] <quit>'])
call s:register(line('$'), 'q', 'special', 'call s:close()', '') call s:register(line('$'), 'q', 'special', 'call s:close()', '')
else else
" Don't overwrite the last regular entry, thus +1 " Don't overwrite the last regular entry, thus +1
@ -433,7 +433,7 @@ endfunction
" Function: #pad {{{1 " Function: #pad {{{1
function! startify#pad(lines) abort function! startify#pad(lines) abort
return map(copy(a:lines), 'g:startify_padding_left . v:val') return map(copy(a:lines), 's:leftpad . v:val')
endfunction endfunction
" Function: #center {{{1 " Function: #center {{{1
@ -466,11 +466,11 @@ function! s:get_lists() abort
return lists return lists
else else
return [ return [
\ { 'header': [g:startify_padding_left .'MRU'], 'type': 'files' }, \ { 'header': [s:leftpad .'MRU'], 'type': 'files' },
\ { 'header': [g:startify_padding_left .'MRU '. getcwd()], 'type': 'dir' }, \ { 'header': [s:leftpad .'MRU '. getcwd()], 'type': 'dir' },
\ { 'header': [g:startify_padding_left .'Sessions'], 'type': 'sessions' }, \ { 'header': [s:leftpad .'Sessions'], 'type': 'sessions' },
\ { 'header': [g:startify_padding_left .'Bookmarks'], 'type': 'bookmarks' }, \ { 'header': [s:leftpad .'Bookmarks'], 'type': 'bookmarks' },
\ { 'header': [g:startify_padding_left .'Commands'], 'type': 'commands' }, \ { 'header': [s:leftpad .'Commands'], 'type': 'commands' },
\ ] \ ]
endif endif
endfunction endfunction
@ -511,7 +511,7 @@ function! s:show_lists(lists) abort
let path = get(entry, 'path', '') let path = get(entry, 'path', '')
let type = get(entry, 'type', empty(path) ? 'special' : 'file') let type = get(entry, 'type', empty(path) ? 'special' : 'file')
let index = s:get_index_as_string() let index = s:get_index_as_string()
call append('$', g:startify_padding_left .'['. index .']'. repeat(' ', (3 - strlen(index))) . entry.line) call append('$', s:leftpad .'['. index .']'. repeat(' ', (3 - strlen(index))) . entry.line)
call s:register(line('$'), index, type, cmd, path) call s:register(line('$'), index, type, cmd, path)
endfor endfor
call append('$', '') call append('$', '')
@ -558,7 +558,7 @@ function! s:display_by_path(path_prefix, path_format, use_env) abort
let oldfiles = call(get(g:, 'startify_enable_unsafe') ? 's:filter_oldfiles_unsafe' : 's:filter_oldfiles', let oldfiles = call(get(g:, 'startify_enable_unsafe') ? 's:filter_oldfiles_unsafe' : 's:filter_oldfiles',
\ [a:path_prefix, a:path_format, a:use_env]) \ [a:path_prefix, a:path_format, a:use_env])
let entry_format = "g:startify_padding_left .'['. index .']'. repeat(' ', (3 - strlen(index))) ." let entry_format = "s:leftpad .'['. index .']'. repeat(' ', (3 - strlen(index))) ."
if exists('*StartifyEntryFormat') if exists('*StartifyEntryFormat')
let entry_format .= StartifyEntryFormat() let entry_format .= StartifyEntryFormat()
else else
@ -719,7 +719,7 @@ function! s:show_sessions() abort
let index = s:get_index_as_string() let index = s:get_index_as_string()
let fname = fnamemodify(sfiles[i], ':t') let fname = fnamemodify(sfiles[i], ':t')
let dname = sfiles[i] ==# v:this_session ? fname.' (*)' : fname let dname = sfiles[i] ==# v:this_session ? fname.' (*)' : fname
call append('$', g:startify_padding_left .'['. index .']'. repeat(' ', (3 - strlen(index))) . dname) call append('$', s:leftpad .'['. index .']'. repeat(' ', (3 - strlen(index))) . dname)
if has('win32') if has('win32')
let fname = substitute(fname, '\[', '\[[]', 'g') let fname = substitute(fname, '\[', '\[[]', 'g')
endif endif
@ -756,7 +756,7 @@ function! s:show_bookmarks() abort
if empty(entry_path) if empty(entry_path)
let entry_path = path let entry_path = path
endif endif
call append('$', g:startify_padding_left .'['. index .']'. repeat(' ', (3 - strlen(index))) . entry_path) call append('$', s:leftpad .'['. index .']'. repeat(' ', (3 - strlen(index))) . entry_path)
if has('win32') if has('win32')
let path = substitute(path, '\[', '\[[]', 'g') let path = substitute(path, '\[', '\[[]', 'g')
@ -789,7 +789,7 @@ function! s:show_commands() abort
" If no list is given, the description is the command itself. " If no list is given, the description is the command itself.
let [desc, cmd] = type(command) == type([]) ? command : [command, command] let [desc, cmd] = type(command) == type([]) ? command : [command, command]
call append('$', g:startify_padding_left .'['. index .']'. repeat(' ', (3 - strlen(index))) . desc) call append('$', s:leftpad .'['. index .']'. repeat(' ', (3 - strlen(index))) . desc)
call s:register(line('$'), index, 'special', cmd, '') call s:register(line('$'), index, 'special', cmd, '')
unlet entry command unlet entry command
@ -813,9 +813,7 @@ endfunction
" Function: s:set_cursor {{{1 " Function: s:set_cursor {{{1
function! s:set_cursor() abort function! s:set_cursor() abort
let b:startify.oldline = exists('b:startify.newline') let b:startify.oldline = exists('b:startify.newline') ? b:startify.newline : s:fixed_column
\ ? b:startify.newline
\ : 2 + len(g:startify_padding_left)
let b:startify.newline = line('.') let b:startify.newline = line('.')
" going up (-1) or down (1) " going up (-1) or down (1)
@ -1126,6 +1124,7 @@ let g:startify_skiplist = extend(get(g:, 'startify_skiplist', []), [
\ escape(fnamemodify(resolve($VIMRUNTIME), ':p'), '\') .'doc/.*\.txt$', \ escape(fnamemodify(resolve($VIMRUNTIME), ':p'), '\') .'doc/.*\.txt$',
\ ], 'keep') \ ], 'keep')
let g:startify_padding_left = repeat(' ', get(g:, 'startify_padding_left', 3)) let g:startify_padding_left = get(g:, 'startify_padding_left', 3)
let s:fixed_column = len(g:startify_padding_left) + 2 let s:leftpad = repeat(' ', g:startify_padding_left)
let s:fixed_column = g:startify_padding_left + 2
let s:batchmode = '' let s:batchmode = ''