From 805c1c3f347160c45e6d69daa57997885f316010 Mon Sep 17 00:00:00 2001 From: Wang Shidong Date: Sun, 2 Jun 2019 11:59:43 +0800 Subject: [PATCH] Better deafult (#2865) * Change default windows index type * Chaneg option enable_tabline_filetype_icon change enable_tabline_filetype_icon to enable_tabline_ft_icon * Disable true colors by default * Changes default buffer_index_type to 4 * Change default statusline sep --- README.md | 2 +- autoload/SpaceVim.vim | 69 +++++++-- autoload/SpaceVim/layers/core/tabline.vim | 6 +- .../tabline/formatters/spacevim.vim | 2 +- config/plugins/vim-startify.vim | 4 +- doc/SpaceVim.txt | 139 +++++++++++------- docs/documentation.md | 5 +- 7 files changed, 154 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index 949914d61..c65884809 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Here is an example for using toml as SpaceVim config: statusline_inactive_separator = "bar" buffer_index_type = 4 windows_index_type = 3 - enable_tabline_filetype_icon = false + enable_tabline_ft_icon = false enable_statusline_mode = false statusline_unicode_symbols = false # Enable Vim compatible mode, avoid changing origin Vim key bindings diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index 4c34ad891..67c20e5f8 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -124,17 +124,17 @@ let g:spacevim_home_files_number = 6 "" " @section enable_guicolors, options-enable_guicolors " @parentsection options -" Enable true color support in terminal. Default is true. +" Enable true color support in terminal. Default is false. " > " enable_guicolors = true " < "" -" Enable true color support in terminal. Default is 1. +" Enable true color support in terminal. Default is 0. " > " let g:spacevim_enable_guicolors = 1 " < -let g:spacevim_enable_guicolors = 1 +let g:spacevim_enable_guicolors = 0 "" " @section enable_googlesuggest, options-enable_googlesuggest @@ -385,7 +385,7 @@ let g:spacevim_enable_cursorline = 1 "" " @section statusline_separator, options-statusline_separator " @parentsection options -" Set the statusline separators of statusline, default is 'arrow' +" Set the statusline separators of statusline, default is 'nil' " > " Separators options: " 1. arrow @@ -399,7 +399,7 @@ let g:spacevim_enable_cursorline = 1 " "" -" Set the statusline separators of statusline, default is 'arrow' +" Set the statusline separators of statusline, default is 'nil' " > " Separators options: " 1. arrow @@ -411,12 +411,12 @@ let g:spacevim_enable_cursorline = 1 " " See more details in: http://spacevim.org/documentation/#statusline " -let g:spacevim_statusline_separator = 'arrow' +let g:spacevim_statusline_separator = 'nil' "" " @section statusline_iseparator, options-statusline_iseparator " @parentsection options " Set the statusline separators of statusline in inactive windows, default is -" 'arrow' +" 'nil' " > " Separators options: " 1. arrow @@ -431,7 +431,7 @@ let g:spacevim_statusline_separator = 'arrow' "" " Set the statusline separators of statusline in inactive windows, default is -" 'arrow' +" 'nil' " > " Separators options: " 1. arrow @@ -443,7 +443,7 @@ let g:spacevim_statusline_separator = 'arrow' " " See more details in: http://spacevim.org/documentation/#statusline " -let g:spacevim_statusline_iseparator = 'arrow' +let g:spacevim_statusline_iseparator = 'nil' "" " @section enable_statusline_bfpath, options-enable_statusline_bfpath @@ -802,7 +802,22 @@ let g:spacevim_hiddenfileinfo = 1 let g:spacevim_gitcommit_pr_icon = '' let g:spacevim_gitcommit_issue_icon = '' "" -" Set SpaceVim buffer index type, default is 0. +" @section buffer_index_type, options-buffer_index_type +" @parentsection options +" Set SpaceVim buffer index type, default is 4. +" > +" # types: +" # 0: 1 ➛ ➊ +" # 1: 1 ➛ ➀ +" # 2: 1 ➛ ⓵ +" # 3: 1 ➛ ¹ +" # 4: 1 ➛ 1 +" buffer_index_type = 1 +" < + + +"" +" Set SpaceVim buffer index type, default is 4. " > " " types: " " 0: 1 ➛ ➊ @@ -812,9 +827,25 @@ let g:spacevim_gitcommit_issue_icon = '' " " 4: 1 ➛ 1 " let g:spacevim_buffer_index_type = 1 " < -let g:spacevim_buffer_index_type = 0 +let g:spacevim_buffer_index_type = 4 + "" -" Set SpaceVim windows index type, default is 0. +" @section windows_index_type, options-windows_index_type +" @parentsection options +" Set SpaceVim windows index type, default is 3. +" > +" # types: +" # 0: 1 ➛ ➊ +" # 1: 1 ➛ ➀ +" # 2: 1 ➛ ⓵ +" # 3: 1 ➛ 1 +" windows_index_type = 1 +" < + + + +"" +" Set SpaceVim windows index type, default is 3. " > " " types: " " 0: 1 ➛ ➊ @@ -823,10 +854,20 @@ let g:spacevim_buffer_index_type = 0 " " 3: 1 ➛ 1 " let g:spacevim_windows_index_type = 1 " < -let g:spacevim_windows_index_type = 0 +let g:spacevim_windows_index_type = 3 +"" +" @section enable_tabline_ft_icon, options-enable_tabline_ft_icon +" @parentsection options +" Enable/Disable tabline filetype icon. default is false. To enable this +" feature: +" > +" enable_tabline_ft_icon = true +" < + + "" " Enable/Disable tabline filetype icon. default is 0. -let g:spacevim_enable_tabline_filetype_icon = 0 +let g:spacevim_enable_tabline_ft_icon = 0 "" " Enable/Disable os fileformat icon. default is 0. let g:spacevim_enable_os_fileformat_icon = 0 diff --git a/autoload/SpaceVim/layers/core/tabline.vim b/autoload/SpaceVim/layers/core/tabline.vim index 2de5b7c16..48060b47c 100644 --- a/autoload/SpaceVim/layers/core/tabline.vim +++ b/autoload/SpaceVim/layers/core/tabline.vim @@ -51,7 +51,7 @@ function! s:tabname(id) abort let id = s:messletters.bubble_num(a:id, g:spacevim_buffer_index_type) . ' ' endif let fn = fnamemodify(bufname(a:id), ':t') - if g:spacevim_enable_tabline_filetype_icon + if g:spacevim_enable_tabline_ft_icon || get(g:, 'spacevim_enable_tabline_filetype_icon', 0) let icon = s:file.fticon(fn) if !empty(icon) let fn = fn . ' ' . icon @@ -116,7 +116,7 @@ function! SpaceVim#layers#core#tabline#get() abort endif call add(stack, buflist[winnr - 1]) call s:need_show_bfname(stack, buflist[winnr - 1]) - if g:spacevim_enable_tabline_filetype_icon + if g:spacevim_enable_tabline_ft_icon || get(g:, 'spacevim_enable_tabline_filetype_icon', 0) let icon = s:file.fticon(name) if !empty(icon) let name = name . ' ' . icon @@ -184,7 +184,7 @@ function! SpaceVim#layers#core#tabline#get() abort else let id = s:messletters.circled_num(index(s:buffers, i) + 1, g:spacevim_buffer_index_type) endif - if g:spacevim_enable_tabline_filetype_icon + if g:spacevim_enable_tabline_ft_icon || get(g:, 'spacevim_enable_tabline_filetype_icon', 0) let icon = s:file.fticon(name) if !empty(icon) let name = name . ' ' . icon diff --git a/autoload/airline/extensions/tabline/formatters/spacevim.vim b/autoload/airline/extensions/tabline/formatters/spacevim.vim index 8a29cec97..7049c0ef3 100644 --- a/autoload/airline/extensions/tabline/formatters/spacevim.vim +++ b/autoload/airline/extensions/tabline/formatters/spacevim.vim @@ -12,7 +12,7 @@ function! airline#extensions#tabline#formatters#spacevim#format(bufnr, buffers) " unique_tail_improved let id = SpaceVim#api#messletters#get().bubble_num(a:bufnr, g:spacevim_buffer_index_type) . ' ' let fn = airline#extensions#tabline#formatters#unique_tail_improved#format(a:bufnr, a:buffers) - if g:spacevim_enable_tabline_filetype_icon + if g:spacevim_enable_tabline_ft_icon || get(g:, 'spacevim_enable_tabline_filetype_icon', 0) let icon = SpaceVim#api#import('file').fticon(bufname(a:bufnr)) if !empty(icon) let fn = icon . ' ' . fn diff --git a/config/plugins/vim-startify.vim b/config/plugins/vim-startify.vim index e5530110c..56ad94b9f 100644 --- a/config/plugins/vim-startify.vim +++ b/config/plugins/vim-startify.vim @@ -62,7 +62,9 @@ if !exists('g:startify_custom_header') endif call SpaceVim#mapping#space#def('nnoremap', ['a','s'], 'Startify | doautocmd WinEnter', 'fancy start screen',1) -if g:spacevim_enable_tabline_filetype_icon +if g:spacevim_enable_tabline_ft_icon || get(g:, 'spacevim_enable_tabline_filetype_icon', 0) + " the old option g:spacevim_enable_tabline_filetype_icon should also works + " well function! FileIcon(path) let icon = s:FILE.fticon(a:path) diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt index f642b45e3..e8c6e85ed 100644 --- a/doc/SpaceVim.txt +++ b/doc/SpaceVim.txt @@ -19,47 +19,50 @@ CONTENTS *SpaceVim-contents* 1. Introduction.............................................|SpaceVim-intro| 2. Options................................................|SpaceVim-options| 1. autocomplete_method............|SpaceVim-options-autocomplete_method| - 2. checkinstall..........................|SpaceVim-options-checkinstall| - 3. colorscheme............................|SpaceVim-options-colorscheme| - 4. colorscheme_bg......................|SpaceVim-options-colorscheme_bg| - 5. default_indent......................|SpaceVim-options-default_indent| - 6. enable_ale..............................|SpaceVim-options-enable_ale| - 7. enable_bepo_layout..............|SpaceVim-options-enable_bepo_layout| - 8. enable_cursorline................|SpaceVim-options-enable_cursorline| - 9. enable_debug..........................|SpaceVim-options-enable_debug| - 10. enable_googlesuggest.........|SpaceVim-options-enable_googlesuggest| - 11. enable_guicolors.................|SpaceVim-options-enable_guicolors| - 12. enable_insert_leader.........|SpaceVim-options-enable_insert_leader| - 13. enable_key_frequency.........|SpaceVim-options-enable_key_frequency| - 14. enable_neomake.....................|SpaceVim-options-enable_neomake| - 15. enable_statusline_bfpath.|SpaceVim-options-enable_statusline_bfpath| - 16. enable_statusline_mode.....|SpaceVim-options-enable_statusline_mode| - 17. enable_statusline_tag.......|SpaceVim-options-enable_statusline_tag| - 18. enable_ycm.............................|SpaceVim-options-enable_ycm| - 19. error_symbol.........................|SpaceVim-options-error_symbol| - 20. filemanager...........................|SpaceVim-options-filemanager| - 21. filetree_direction.............|SpaceVim-options-filetree_direction| - 22. guifont...................................|SpaceVim-options-guifont| - 23. home_files_number...............|SpaceVim-options-home_files_number| - 24. info_symbol...........................|SpaceVim-options-info_symbol| - 25. keep_server_alive...............|SpaceVim-options-keep_server_alive| - 26. language.................................|SpaceVim-options-language| - 27. lint_on_the_fly...................|SpaceVim-options-lint_on_the_fly| - 28. max_column.............................|SpaceVim-options-max_column| - 29. plugin_bundle_dir...............|SpaceVim-options-plugin_bundle_dir| - 30. plugin_manager_processes.|SpaceVim-options-plugin_manager_processes| - 31. realtime_leader_guide.......|SpaceVim-options-realtime_leader_guide| - 32. relativenumber.....................|SpaceVim-options-relativenumber| - 33. retry_cnt...............................|SpaceVim-options-retry_cnt| - 34. sidebar_width.......................|SpaceVim-options-sidebar_width| - 35. simple_mode...........................|SpaceVim-options-simple_mode| - 36. snippet_engine.....................|SpaceVim-options-snippet_engine| - 37. statusline_iseparator.......|SpaceVim-options-statusline_iseparator| - 38. statusline_left_sections.|SpaceVim-options-statusline_left_sections| - 39. statusline_separator.........|SpaceVim-options-statusline_separator| - 40. terminal_cursor_shape.......|SpaceVim-options-terminal_cursor_shape| - 41. warning_symbol.....................|SpaceVim-options-warning_symbol| - 42. windows_leader.....................|SpaceVim-options-windows_leader| + 2. buffer_index_type................|SpaceVim-options-buffer_index_type| + 3. checkinstall..........................|SpaceVim-options-checkinstall| + 4. colorscheme............................|SpaceVim-options-colorscheme| + 5. colorscheme_bg......................|SpaceVim-options-colorscheme_bg| + 6. default_indent......................|SpaceVim-options-default_indent| + 7. enable_ale..............................|SpaceVim-options-enable_ale| + 8. enable_bepo_layout..............|SpaceVim-options-enable_bepo_layout| + 9. enable_cursorline................|SpaceVim-options-enable_cursorline| + 10. enable_debug.........................|SpaceVim-options-enable_debug| + 11. enable_googlesuggest.........|SpaceVim-options-enable_googlesuggest| + 12. enable_guicolors.................|SpaceVim-options-enable_guicolors| + 13. enable_insert_leader.........|SpaceVim-options-enable_insert_leader| + 14. enable_key_frequency.........|SpaceVim-options-enable_key_frequency| + 15. enable_neomake.....................|SpaceVim-options-enable_neomake| + 16. enable_statusline_bfpath.|SpaceVim-options-enable_statusline_bfpath| + 17. enable_statusline_mode.....|SpaceVim-options-enable_statusline_mode| + 18. enable_statusline_tag.......|SpaceVim-options-enable_statusline_tag| + 19. enable_tabline_ft_icon.....|SpaceVim-options-enable_tabline_ft_icon| + 20. enable_ycm.............................|SpaceVim-options-enable_ycm| + 21. error_symbol.........................|SpaceVim-options-error_symbol| + 22. filemanager...........................|SpaceVim-options-filemanager| + 23. filetree_direction.............|SpaceVim-options-filetree_direction| + 24. guifont...................................|SpaceVim-options-guifont| + 25. home_files_number...............|SpaceVim-options-home_files_number| + 26. info_symbol...........................|SpaceVim-options-info_symbol| + 27. keep_server_alive...............|SpaceVim-options-keep_server_alive| + 28. language.................................|SpaceVim-options-language| + 29. lint_on_the_fly...................|SpaceVim-options-lint_on_the_fly| + 30. max_column.............................|SpaceVim-options-max_column| + 31. plugin_bundle_dir...............|SpaceVim-options-plugin_bundle_dir| + 32. plugin_manager_processes.|SpaceVim-options-plugin_manager_processes| + 33. realtime_leader_guide.......|SpaceVim-options-realtime_leader_guide| + 34. relativenumber.....................|SpaceVim-options-relativenumber| + 35. retry_cnt...............................|SpaceVim-options-retry_cnt| + 36. sidebar_width.......................|SpaceVim-options-sidebar_width| + 37. simple_mode...........................|SpaceVim-options-simple_mode| + 38. snippet_engine.....................|SpaceVim-options-snippet_engine| + 39. statusline_iseparator.......|SpaceVim-options-statusline_iseparator| + 40. statusline_left_sections.|SpaceVim-options-statusline_left_sections| + 41. statusline_separator.........|SpaceVim-options-statusline_separator| + 42. terminal_cursor_shape.......|SpaceVim-options-terminal_cursor_shape| + 43. warning_symbol.....................|SpaceVim-options-warning_symbol| + 44. windows_index_type.............|SpaceVim-options-windows_index_type| + 45. windows_leader.....................|SpaceVim-options-windows_leader| 3. Configuration...........................................|SpaceVim-config| 4. Commands..............................................|SpaceVim-commands| 5. Functions............................................|SpaceVim-functions| @@ -161,6 +164,20 @@ Set the autocomplete engine of spacevim, the default logic is: and you can alse set this option to coc, then coc.nvim will be used. +============================================================================== +BUFFER_INDEX_TYPE *SpaceVim-options-buffer_index_type* + +Set SpaceVim buffer index type, default is 4. +> + # types: + # 0: 1 ➛ ➊ + # 1: 1 ➛ ➀ + # 2: 1 ➛ ⓵ + # 3: 1 ➛ ¹ + # 4: 1 ➛ 1 + buffer_index_type = 1 +< + ============================================================================== CHECKINSTALL *SpaceVim-options-checkinstall* @@ -231,7 +248,7 @@ Enable/Disable Google suggestions for neocomplete. Default is false. ============================================================================== ENABLE_GUICOLORS *SpaceVim-options-enable_guicolors* -Enable true color support in terminal. Default is true. +Enable true color support in terminal. Default is false. > enable_guicolors = true < @@ -284,6 +301,15 @@ Enable/Disable showing current tag on statusline enable_statusline_tag = false < +============================================================================== +ENABLE_TABLINE_FT_ICON *SpaceVim-options-enable_tabline_ft_icon* + +Enable/Disable tabline filetype icon. default is false. To enable this +feature: +> + enable_tabline_ft_icon = true +< + ============================================================================== ENABLE_YCM *SpaceVim-options-enable_ycm* @@ -433,7 +459,7 @@ ultisnips: STATUSLINE_ISEPARATOR *SpaceVim-options-statusline_iseparator* Set the statusline separators of statusline in inactive windows, default is -'arrow' +'nil' > Separators options: 1. arrow @@ -463,7 +489,7 @@ Define the left section of statusline in active windows. By default: ============================================================================== STATUSLINE_SEPARATOR *SpaceVim-options-statusline_separator* -Set the statusline separators of statusline, default is 'arrow' +Set the statusline separators of statusline, default is 'nil' > Separators options: 1. arrow @@ -503,6 +529,19 @@ Set the warning symbol for SpaceVim's syntax maker. Default is '⚠'. warning_symbol = '!' < +============================================================================== +WINDOWS_INDEX_TYPE *SpaceVim-options-windows_index_type* + +Set SpaceVim windows index type, default is 3. +> + # types: + # 0: 1 ➛ ➊ + # 1: 1 ➛ ➀ + # 2: 1 ➛ ⓵ + # 3: 1 ➛ 1 + windows_index_type = 1 +< + ============================================================================== WINDOWS_LEADER *SpaceVim-options-windows_leader* @@ -550,7 +589,7 @@ Change the list number of files for SpaceVim home. Default is 6. < *g:spacevim_enable_guicolors* -Enable true color support in terminal. Default is 1. +Enable true color support in terminal. Default is 0. > let g:spacevim_enable_guicolors = 1 < @@ -651,7 +690,7 @@ normal mode.To disable this feature: < *g:spacevim_statusline_separator* -Set the statusline separators of statusline, default is 'arrow' +Set the statusline separators of statusline, default is 'nil' > Separators options: 1. arrow @@ -666,7 +705,7 @@ See more details in: http://spacevim.org/documentation/#statusline *g:spacevim_statusline_iseparator* Set the statusline separators of statusline in inactive windows, default is -'arrow' +'nil' > Separators options: 1. arrow @@ -867,7 +906,7 @@ Set the debug level of SpaceVim. Default is 1. see |SpaceVim#logger#setLevel()| *g:spacevim_buffer_index_type* -Set SpaceVim buffer index type, default is 0. +Set SpaceVim buffer index type, default is 4. > " types: " 0: 1 ➛ ➊ @@ -879,7 +918,7 @@ Set SpaceVim buffer index type, default is 0. < *g:spacevim_windows_index_type* -Set SpaceVim windows index type, default is 0. +Set SpaceVim windows index type, default is 3. > " types: " 0: 1 ➛ ➊ @@ -889,7 +928,7 @@ Set SpaceVim windows index type, default is 0. let g:spacevim_windows_index_type = 1 < - *g:spacevim_enable_tabline_filetype_icon* + *g:spacevim_enable_tabline_ft_icon* Enable/Disable tabline filetype icon. default is 0. *g:spacevim_enable_os_fileformat_icon* diff --git a/docs/documentation.md b/docs/documentation.md index cdcab10ff..c478e26e1 100644 --- a/docs/documentation.md +++ b/docs/documentation.md @@ -378,9 +378,8 @@ the variable colorschemes. For instance, to specify `desert`: All the included colorschemes can be found in [colorscheme layer](../layers/colorscheme/). -**NOTE**: - -SpaceVim uses true colors by default, so you should make sure your terminal supports true colors. +SpaceVim supports true colors in terminal, and it is disabled by default, to enable this feature, +you should make sure your terminal supports true colors. For more information see: [Colours in terminal](https://gist.github.com/XVilka/8346728). If your terminal does not support true colors, you can disable SpaceVim true colors feature in `[options]` section: