Merge branch 'dev' into codecov

autoload/SpaceVim.vim

@@ -162,6 +162,21 @@ let g:spacevim_statusline_unicode_symbols = 1
 " <
 let g:spacevim_enable_statusline_display_mode     = 0
 ""
+" Set the statusline/tabline palette of color, default values depends on the theme
+" >
+"   let g:spacevim_custom_color_palette = [
+"     \ ['#282828', '#b8bb26', 246, 235],
+"     \ ['#a89984', '#504945', 239, 246],
+"     \ ['#a89984', '#3c3836', 237, 246],
+"     \ ['#665c54', 241],
+"     \ ['#282828', '#83a598', 235, 109],
+"     \ ['#282828', '#fe8019', 235, 208],
+"     \ ['#282828', '#8ec07c', 235, 108],
+"     \ ]
+" <
+"
+let g:spacevim_custom_color_palette = []
+""
 " Enable/Disable cursorcolumn. Default is 0, cursorcolumn will be
 " highlighted in normal mode. To enable this feature:
 " >
@@ -197,7 +212,7 @@ let g:spacevim_use_colorscheme         = 1
 " Set the help language of vim. Default is 'en'. 
 " You can change it to Chinese.
 " >
-"   let g:spacevim_vim_help_language = 'chinese'
+"   let g:spacevim_vim_help_language = 'cn'
 " <
 let g:spacevim_vim_help_language       = 'en'
 ""
@@ -510,7 +525,7 @@ function! SpaceVim#end() abort
     endfor
     if g:spacevim_vim_help_language ==# 'cn'
       call add(g:spacevim_plugin_groups, 'chinese')
-    elseif g:spacevim_vim_help_language ==# 'japanese'
+    elseif g:spacevim_vim_help_language ==# 'ja'
       call add(g:spacevim_plugin_groups, 'japanese')
     endif
     if g:spacevim_use_colorscheme==1

autoload/SpaceVim/layers/core/statusline.vim

@@ -338,12 +338,16 @@ endfunction
 let s:colors_template = SpaceVim#mapping#guide#theme#gruvbox#palette()
 
 function! SpaceVim#layers#core#statusline#def_colors() abort
-  let name = get(g:, 'colors_name', 'gruvbox')
-  try
-    let t = SpaceVim#mapping#guide#theme#{name}#palette()
-  catch /^Vim\%((\a\+)\)\=:E117/
-    let t = SpaceVim#mapping#guide#theme#gruvbox#palette()
-  endtry
+  if !empty(g:spacevim_custom_color_palette)
+    let t = g:spacevim_custom_color_palette
+  else
+    let name = get(g:, 'colors_name', 'gruvbox')
+    try
+      let t = SpaceVim#mapping#guide#theme#{name}#palette()
+    catch /^Vim\%((\a\+)\)\=:E117/
+      let t = SpaceVim#mapping#guide#theme#gruvbox#palette()
+    endtry
+  endif
   let s:colors_template = t
   exe 'hi! SpaceVim_statusline_a ctermbg=' . t[0][2] . ' ctermfg=' . t[0][3] . ' guibg=' . t[0][1] . ' guifg=' . t[0][0]
   exe 'hi! SpaceVim_statusline_a_bold cterm=bold gui=bold ctermbg=' . t[0][2] . ' ctermfg=' . t[0][3] . ' guibg=' . t[0][1] . ' guifg=' . t[0][0]

autoload/SpaceVim/layers/core/tabline.vim

@@ -193,12 +193,16 @@ function! SpaceVim#layers#core#tabline#jump(id) abort
 endfunction
 
 function! SpaceVim#layers#core#tabline#def_colors() abort
-    let name = get(g:, 'colors_name', 'gruvbox')
-    try
+    if !empty(g:spacevim_custom_color_palette)
+      let t = g:spacevim_custom_color_palette
+    else
+      let name = get(g:, 'colors_name', 'gruvbox')
+      try
         let t = SpaceVim#mapping#guide#theme#{name}#palette()
-    catch /^Vim\%((\a\+)\)\=:E117/
+      catch /^Vim\%((\a\+)\)\=:E117/
         let t = SpaceVim#mapping#guide#theme#gruvbox#palette()
-    endtry
+      endtry
+    endif
     exe 'hi! SpaceVim_tabline_a ctermbg=' . t[0][2] . ' ctermfg=' . t[0][3] . ' guibg=' . t[0][1] . ' guifg=' . t[0][0]
     exe 'hi! SpaceVim_tabline_b ctermbg=' . t[1][2] . ' ctermfg=' . t[1][3] . ' guibg=' . t[1][1] . ' guifg=' . t[1][0]
     call s:HI.hi_separator('SpaceVim_tabline_a', 'SpaceVim_tabline_b')

doc/SpaceVim.txt

@@ -198,6 +198,20 @@ statusline. To enable this feature:
   let g:spacevim_enable_statusline_display_mode = 1
 <
 
+                                             *g:spacevim_custom_color_palette*
+Add custom color palette for statusline and tabline.
+>
+  let g:spacevim_custom_color_palette = [
+  \ ['#282828', '#b8bb26', 246, 235],
+  \ ['#a89984', '#504945', 239, 246],
+  \ ['#a89984', '#3c3836', 237, 246],
+  \ ['#665c54', 241],
+  \ ['#282828', '#83a598', 235, 109],
+  \ ['#282828', '#fe8019', 235, 208],
+  \ ['#282828', '#8ec07c', 235, 108],
+  \ ]
+<
+
                                               *g:spacevim_enable_cursorcolumn*
 Enable/Disable cursorcolumn. Default is 0, cursorcolumn will be highlighted in
 normal mode. To enable this feature:
@@ -232,7 +246,7 @@ might require adding the following to ~/.tmux.conf:
                                                 *g:spacevim_vim_help_language*
 Set the help language of vim. Default is 'en'.  You can change it to Chinese.
 >
-  let g:spacevim_vim_help_language = 'chinese'
+  let g:spacevim_vim_help_language = 'cn'
 <
 
                                                          *g:spacevim_language*

docs/documentation.md

@@ -293,6 +293,17 @@ let g:spacevim_custom_plugins = [
 \ ['wsdjeg/GitHub.vim'],
 \ ]
 
+" If you want to add custom color palette for statusline and tabline, use these options:
+let g:spacevim_custom_color_palette = [
+\ ['#282828', '#b8bb26', 246, 235],
+\ ['#a89984', '#504945', 239, 246],
+\ ['#a89984', '#3c3836', 237, 246],
+\ ['#665c54', 241],
+\ ['#282828', '#83a598', 235, 109],
+\ ['#282828', '#fe8019', 235, 208],
+\ ['#282828', '#8ec07c', 235, 108],
+\ ]
+
 " set the guifont
 let g:spacevim_guifont = 'DejaVu\ Sans\ Mono\ for\ Powerline\ 11'
 ```