From da1843fd0303160417a10af1d883640dbc648fbb Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Sun, 19 Nov 2017 09:29:34 +0800 Subject: [PATCH] Enable fileformat icon --- autoload/SpaceVim.vim | 4 ++++ autoload/SpaceVim/layers/core/statusline.vim | 16 +++++++++++++++- doc/SpaceVim.txt | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index df84fb8a8..5f4923ec5 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -157,6 +157,10 @@ let g:spacevim_enable_cursorline = 1 " let g:spacevim_statusline_separator = 'arrow' let g:spacevim_statusline_inactive_separator = 'arrow' + +let g:spacevim_statusline_left_sections = ['winnr', 'filename', 'major mode', 'minor mode lighters', 'version control info'] +let g:spacevim_statusline_right_sections = ['fileformat', 'cursorpos'] + "" " Enable/Disable unicode symbols in statusline let g:spacevim_statusline_unicode_symbols = 1 diff --git a/autoload/SpaceVim/layers/core/statusline.vim b/autoload/SpaceVim/layers/core/statusline.vim index 2b2ed237f..6afc1029b 100644 --- a/autoload/SpaceVim/layers/core/statusline.vim +++ b/autoload/SpaceVim/layers/core/statusline.vim @@ -15,6 +15,7 @@ let s:TIME = SpaceVim#api#import('time') let s:HI = SpaceVim#api#import('vim#highlight') let s:STATUSLINE = SpaceVim#api#import('vim#statusline') let s:VIMCOMP = SpaceVim#api#import('vim#compatible') +let s:SYSTEM = SpaceVim#api#import('system') " init let s:separators = { @@ -66,6 +67,9 @@ let s:modes = { let s:loaded_sections = ['syntax checking', 'major mode', 'minor mode lighters', 'version control info', 'cursorpos'] +let s:loaded_sections_r = g:spacevim_statusline_right_sections +let s:loaded_sections_l = g:spacevim_statusline_left_sections + function! s:battery_status() abort if executable('acpi') return ' ⚡' . substitute(split(system('acpi'))[-1], '%', '%%', 'g') . ' ' @@ -74,6 +78,16 @@ function! s:battery_status() abort endif endfunction + +if g:spacevim_statusline_unicode_symbols == 1 + let g:_spacevim_statusline_fileformat = s:SYSTEM.fileformat() +else + let g:_spacevim_statusline_fileformat = &ff +endif +function! s:fileformat() abort + return '%{" " . g:_spacevim_statusline_fileformat . " | " . (&fenc!=""?&fenc:&enc) . " "}' +endfunction + function! s:check_mode() abort if mode() == 'n' return 'n' @@ -302,7 +316,7 @@ function! s:active() abort if index(s:loaded_sections, 'battery status') != -1 call add(rsec, s:battery_status()) endif - call add(rsec, '%{" " . &ff . " | " . (&fenc!=""?&fenc:&enc) . " "}') + call add(rsec, s:fileformat()) if index(s:loaded_sections, 'cursorpos') != -1 call add(rsec, s:cursorpos()) endif diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt index 74c6f3c80..f88763022 100644 --- a/doc/SpaceVim.txt +++ b/doc/SpaceVim.txt @@ -445,7 +445,7 @@ COMMANDS *SpaceVim-commands* < :SPReinstall *:SPReinstall* - Command for reinstall plugin, support completion of plugin name. + Command for reinstall plugin, support completion of plugin anme. :SPInstall *:SPInstall* Command for install plugins.