diff --git a/autoload/SpaceVim/layers/denite.vim b/autoload/SpaceVim/layers/denite.vim index 511d91162..675ad16be 100644 --- a/autoload/SpaceVim/layers/denite.vim +++ b/autoload/SpaceVim/layers/denite.vim @@ -7,15 +7,115 @@ "============================================================================= function! SpaceVim#layers#denite#plugins() abort - return [ + let plugins = [ \ ['Shougo/denite.nvim',{ 'merged' : 0, 'loadconf' : 1}], \ ['pocari/vim-denite-emoji', {'merged' : 0}], \ ] + + " neoyark source fh + call add(plugins, ['Shougo/neoyank.vim', {'merged' : 0}]) + call add(plugins, ['chemzqm/unite-location', {'merged' : 0}]) + call add(plugins, ['Shougo/unite-outline', {'merged' : 0}]) + return plugins endfunction function! SpaceVim#layers#denite#config() abort call SpaceVim#mapping#space#def('nnoremap', ['j', 'i'], 'Denite outline', 'jump to a definition in buffer', 1) nnoremap :Denite file_rec + call SpaceVim#mapping#space#def('nnoremap', ['T', 's'], 'Denite colorscheme', 'fuzzy find colorschemes', 1) + let g:_spacevim_mappings.f = {'name' : '+Fuzzy Finder'} + call s:defind_fuzzy_finder() endfunction +let s:file = expand(':~') +let s:unite_lnum = expand('') + 3 +function! s:defind_fuzzy_finder() abort + nnoremap fr + \ :Denite -buffer-name=resume resume + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.r = ['Denite -buffer-name=resume resume', + \ 'resume unite window', + \ [ + \ '[Leader f r ] is to resume unite window', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fe + \ :Denite register + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.r = ['Denite register', + \ 'fuzzy find registers', + \ [ + \ '[Leader f r ] is to resume unite window', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fh + \ :Denite neoyank + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.h = ['Denite neoyank', + \ 'fuzzy find yank history', + \ [ + \ '[Leader f h] is to fuzzy find history and yank content', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fj + \ :Denite jump + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.j = ['Denite jump', + \ 'fuzzy find jump list', + \ [ + \ '[Leader f j] is to fuzzy find jump list', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fl + \ :Denite location_list + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.l = ['Denite location_list', + \ 'fuzzy find location list', + \ [ + \ '[Leader f l] is to fuzzy find location list', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fm + \ :Denite output:message + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.m = ['Denite output:message', + \ 'fuzzy find message', + \ [ + \ '[Leader f m] is to fuzzy find message', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fq + \ :Denite quickfix + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.q = ['Denite quickfix', + \ 'fuzzy find quickfix list', + \ [ + \ '[Leader f q] is to fuzzy find quickfix list', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fo :Denite outline + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.o = ['Denite outline', + \ 'fuzzy find outline', + \ [ + \ '[Leader f o] is to fuzzy find outline', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] +endfunction " vim:set et sw=2 cc=80: diff --git a/autoload/SpaceVim/layers/unite.vim b/autoload/SpaceVim/layers/unite.vim index 7b4384eff..05607a257 100644 --- a/autoload/SpaceVim/layers/unite.vim +++ b/autoload/SpaceVim/layers/unite.vim @@ -19,9 +19,9 @@ function! SpaceVim#layers#unite#plugins() abort \ ['wsdjeg/unite-radio.vim', {'loadconf' : 1, 'merged' : 0}], \ ] - " \ ['mileszs/ack.vim',{'on_cmd' : 'Ack'}], - " \ ['albfan/ag.vim',{'on_cmd' : 'Ag' , 'loadconf' : 1}], - " \ ['dyng/ctrlsf.vim',{'on_cmd' : 'CtrlSF', 'on_map' : 'CtrlSF', 'loadconf' : 1 , 'loadconf_before' : 1}], + " \ ['mileszs/ack.vim',{'on_cmd' : 'Ack'}], + " \ ['albfan/ag.vim',{'on_cmd' : 'Ag' , 'loadconf' : 1}], + " \ ['dyng/ctrlsf.vim',{'on_cmd' : 'CtrlSF', 'on_map' : 'CtrlSF', 'loadconf' : 1 , 'loadconf_before' : 1}], " history/yank source fh call add(plugins, ['Shougo/neoyank.vim', {'merged' : 0}]) @@ -51,6 +51,7 @@ function! SpaceVim#layers#unite#config() abort call SpaceVim#mapping#space#def('nnoremap', ['p', '!'], 'call call(' \ . string(s:_function('s:run_shell_cmd_project')) . ', [])', \ 'shell cmd(project root)', 1) + call SpaceVim#mapping#space#def('nnoremap', ['T', 's'], 'Unite colorscheme', 'fuzzy find colorschemes', 1) let g:_spacevim_mappings.f = {'name' : '+Fuzzy Finder'} call s:defind_fuzzy_finder() endfunction @@ -109,7 +110,7 @@ function! s:defind_fuzzy_finder() abort \ :Unite history/yank let lnum = expand('') + s:unite_lnum - 4 let g:_spacevim_mappings.f.h = ['Unite history/yank', - \ 'fuzzy find history/yank', + \ 'fuzzy find yank history', \ [ \ '[Leader f h] is to fuzzy find history and yank content', \ '', @@ -160,8 +161,7 @@ function! s:defind_fuzzy_finder() abort \ 'Definition: ' . s:file . ':' . lnum, \ ] \ ] - nnoremap fo :Unite -buffer-name=outline - \ -start-insert -auto-preview -split outline + nnoremap fo :Unite outline let lnum = expand('') + s:unite_lnum - 4 let g:_spacevim_mappings.f.o = ['Unite outline', \ 'fuzzy find outline', @@ -171,7 +171,6 @@ function! s:defind_fuzzy_finder() abort \ 'Definition: ' . s:file . ':' . lnum, \ ] \ ] - call SpaceVim#mapping#space#def('nnoremap', ['T', 's'], 'Unite colorscheme', 'unite-colorschemes', 1) endfunction function! s:run_shell_cmd() abort diff --git a/docs/layers/denite.md b/docs/layers/denite.md index c1306bb32..ff229f8c6 100644 --- a/docs/layers/denite.md +++ b/docs/layers/denite.md @@ -1,6 +1,6 @@ --- title: "SpaceVim denite layer" -description: "Another Unite centric work-flow which use denite" +description: "This layers provide a heavily customized Denite centric work-flow" --- # [SpaceVim Layers:](https://spacevim.org/layers) denite @@ -13,3 +13,18 @@ This layer is a heavily customized warpper for denite and it's sources. ## Configuration SpaceVim use `F` as the default customized key bindings prefix for denite layer. + +## Key bindings + +| Key bindings | Discription | +| -------------------- | ----------------------------- | +| ` f ` | Fuzzy find menu:CustomKeyMaps | +| ` f e` | Fuzzy find register | +| ` f f` | Fuzzy find file | +| ` f h` | Fuzzy find history/yank | +| ` f j` | Fuzzy find jump, change | +| ` f l` | Fuzzy find location list | +| ` f m` | Fuzzy find output messages | +| ` f o` | Fuzzy find outline | +| ` f q` | Fuzzy find quick fix | +| ` f r` | Resumes Unite window | diff --git a/docs/layers/unite.md b/docs/layers/unite.md index 1767ec4c2..ac47a65c3 100644 --- a/docs/layers/unite.md +++ b/docs/layers/unite.md @@ -9,8 +9,6 @@ description: "This layers provide a heavily customized Unite centric work-flow" This layer is a heavily customized warpper for unite.vim and unite sources. -![unite](https://cloud.githubusercontent.com/assets/13142418/23955542/26fd5348-09d5-11e7-8253-1f43991439b0.png) - ## Configuration This is a fuzzy finder layer for SpaceVim, and it is based on unite.vim. In SpaceVim all fuzzy finder layer use same key bindings: