From bcf6cb6ef681a6ed2574bc7562928ac359f35eb3 Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Mon, 23 Oct 2017 22:25:59 +0900 Subject: [PATCH 1/8] Minor fixes for examples of language setting Minor fixes for examples of language setting. * `chinese` -> `cn` --- autoload/SpaceVim.vim | 2 +- doc/SpaceVim.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index 0272410fa..ee3568bc8 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -212,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' "" diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt index 769d74fad..5620d7d4f 100644 --- a/doc/SpaceVim.txt +++ b/doc/SpaceVim.txt @@ -246,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* From b4488e68c2e8a94ab08627c0d2ba23bda510e728 Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Mon, 23 Oct 2017 22:27:47 +0900 Subject: [PATCH 2/8] Fixed minor fixes for japanese layer loading Fixed minor fixes for japanese layer loading. * `japanese` -> `ja` --- autoload/SpaceVim.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index ee3568bc8..7c9e775c7 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -525,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 From adb8a601adb64b7038182ef26493f38215cada25 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Mon, 23 Oct 2017 22:41:43 +0800 Subject: [PATCH 3/8] Add test --- test/mode.vader | 5 +++++ test/mode.vim | 4 ++++ test/syntax.vader | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 test/mode.vader create mode 100644 test/mode.vim create mode 100644 test/syntax.vader diff --git a/test/mode.vader b/test/mode.vader new file mode 100644 index 000000000..83e09ee7d --- /dev/null +++ b/test/mode.vader @@ -0,0 +1,5 @@ +Execute ( SpaceVim mode ): + so mode/basic.vim + AssertEqual g:spacevim_enable_guicolors, 0 + so mode/dark_powered.vim + AssertEqual g:spacevim_enable_debug, 1 diff --git a/test/mode.vim b/test/mode.vim new file mode 100644 index 000000000..970b6ebdb --- /dev/null +++ b/test/mode.vim @@ -0,0 +1,4 @@ +Execute ( SpaceVim syntax file ): + for sfile in globpath(getcwd(), "syntax/*.vim", 0, 1) + exe 'so ' . sfile + endfor diff --git a/test/syntax.vader b/test/syntax.vader new file mode 100644 index 000000000..970b6ebdb --- /dev/null +++ b/test/syntax.vader @@ -0,0 +1,4 @@ +Execute ( SpaceVim syntax file ): + for sfile in globpath(getcwd(), "syntax/*.vim", 0, 1) + exe 'so ' . sfile + endfor From 608e61101f9d57c5cc52b9db2859d7fac497ee7a Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Mon, 23 Oct 2017 22:42:03 +0800 Subject: [PATCH 4/8] Add tests --- test/mode.vim | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 test/mode.vim diff --git a/test/mode.vim b/test/mode.vim deleted file mode 100644 index 970b6ebdb..000000000 --- a/test/mode.vim +++ /dev/null @@ -1,4 +0,0 @@ -Execute ( SpaceVim syntax file ): - for sfile in globpath(getcwd(), "syntax/*.vim", 0, 1) - exe 'so ' . sfile - endfor From 9fe68c4b40dc24486ecc9674deedd2c91353996f Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Mon, 23 Oct 2017 23:14:13 +0800 Subject: [PATCH 5/8] Add colors test --- autoload/SpaceVim/api/color.vim | 12 ++++++++++++ doc/SpaceVim.txt | 20 +++++++++++--------- test/api/color.vader | 5 +++++ 3 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 test/api/color.vader diff --git a/autoload/SpaceVim/api/color.vim b/autoload/SpaceVim/api/color.vim index 8c77cdcc9..6ac5a4da9 100644 --- a/autoload/SpaceVim/api/color.vim +++ b/autoload/SpaceVim/api/color.vim @@ -54,8 +54,20 @@ let s:self._color_map = { \ '250': '#bcbcbc', '251': '#c6c6c6', '252': '#d0d0d0', '253': '#dadada', '254': '#e4e4e4', \ '255': '#eeeeee', 'fg': 'fg', 'bg': 'bg', 'NONE': 'NONE' } +let s:self._deps = SpaceVim#api#import('data#dict') +function! s:self.nr2str(nr) abort + return get(self._color_map, a:nr, '') +endfunction +function! s:self.str2nr(str) abort + let nr = get(self._deps.swap(self._color_map), a:str, -1) + if nr =~ 'fg\|bg\|NONE' + return nr + else + return str2nr(nr) + endif +endfunction function! SpaceVim#api#color#get() abort diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt index 5620d7d4f..089931ab6 100644 --- a/doc/SpaceVim.txt +++ b/doc/SpaceVim.txt @@ -199,19 +199,21 @@ statusline. To enable this feature: < *g:spacevim_custom_color_palette* -Add custom color palette for statusline and tabline. +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], - \ ] + \ ['#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: diff --git a/test/api/color.vader b/test/api/color.vader new file mode 100644 index 000000000..75bb1d1c5 --- /dev/null +++ b/test/api/color.vader @@ -0,0 +1,5 @@ +Execute ( SpaceVim api color ): + let color = SpaceVim#api#import('color') + AssertEqual color.nr2str(233), '#121212' + AssertEqual color.str2nr('#121212'), 233 + AssertEqual color.str2nr('bg'), 'bg' From 25d89bf34497ec3be04729770203d39ef1ac6315 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Mon, 23 Oct 2017 23:30:24 +0800 Subject: [PATCH 6/8] Add test for data#json api --- test/api/data/json.vader | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 test/api/data/json.vader diff --git a/test/api/data/json.vader b/test/api/data/json.vader new file mode 100644 index 000000000..3e97a7c60 --- /dev/null +++ b/test/api/data/json.vader @@ -0,0 +1,4 @@ +Execute ( SpaceVim api: data#json ): + let json = SpaceVim#api#import('data#json') + AssertEqual json.json_decode('{"foo":"zaa"}'), {'foo' : 'zaa'} + AssertEqual json.json_encode({'foo' : 'zaa'}), '{"foo": "zaa"}' From 179afd81afd425f22794670b38e749d751eae608 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Mon, 23 Oct 2017 23:36:55 +0800 Subject: [PATCH 7/8] Add test for vim#key api --- test/api/vim/key.vader | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 test/api/vim/key.vader diff --git a/test/api/vim/key.vader b/test/api/vim/key.vader new file mode 100644 index 000000000..621064524 --- /dev/null +++ b/test/api/vim/key.vader @@ -0,0 +1,3 @@ +Execute ( SpaceVim api: vim#key ): + let key = SpaceVim#api#import('vim#key') + AssertEqual key.nr2name(32), 'SPC' From 79407e2beb63b11321731b3d2d1b7a7f6d71fabe Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Tue, 24 Oct 2017 00:03:57 +0800 Subject: [PATCH 8/8] Fix json test in vim8 --- test/api/data/json.vader | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/api/data/json.vader b/test/api/data/json.vader index 3e97a7c60..08e80b757 100644 --- a/test/api/data/json.vader +++ b/test/api/data/json.vader @@ -1,4 +1,3 @@ Execute ( SpaceVim api: data#json ): let json = SpaceVim#api#import('data#json') - AssertEqual json.json_decode('{"foo":"zaa"}'), {'foo' : 'zaa'} - AssertEqual json.json_encode({'foo' : 'zaa'}), '{"foo": "zaa"}' + AssertEqual json.json_decode(json.json_encode({'foo' : 'zaa'})), {'foo' : 'zaa'}