1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-02-03 05:30:05 +08:00

Merge branch 'master' of github.com:SpaceVim/SpaceVim

This commit is contained in:
alanding 2019-03-27 04:07:28 +08:00
commit 4348a8c0e3
3 changed files with 10 additions and 10 deletions

View File

@ -111,7 +111,7 @@ function! SpaceVim#layers#denite#config() abort
let lnum = expand('<slnum>') + s:lnum - 1
call SpaceVim#mapping#space#def('nnoremap', ['f', 'f'], 'call call('
\ . string(s:_function('s:warp_denite')) . ', ["DeniteBufferDir file_rec"])',
\ . string(s:_function('s:warp_denite')) . ', ["DeniteBufferDir file/rec"])',
\ ['Find files in the directory of the current buffer',
\ [
\ '[SPC f f] is to find files in the directory of the current buffer',
@ -123,7 +123,7 @@ function! SpaceVim#layers#denite#config() abort
let lnum = expand('<slnum>') + s:lnum - 1
call SpaceVim#mapping#space#def('nnoremap', ['p', 'f'], 'call call('
\ . string(s:_function('s:warp_denite')) . ', ["Denite file_rec"])',
\ . string(s:_function('s:warp_denite')) . ', ["Denite file/rec"])',
\ ['find files in current project',
\ [
\ '[SPC p f] is to find files in the root of the current project',
@ -132,7 +132,7 @@ function! SpaceVim#layers#denite#config() abort
\ ]
\ ],
\ 1)
nnoremap <silent> <C-p> :call <SID>warp_denite('Denite file_rec')<cr>
nnoremap <silent> <C-p> :call <SID>warp_denite('Denite file/rec')<cr>
let lnum = expand('<slnum>') + s:lnum - 1

View File

@ -36,13 +36,13 @@ if !s:sys.isWindows
if executable('rg')
" For ripgrep
" Note: It is slower than ag
call denite#custom#var('file_rec', 'command',
call denite#custom#var('file/rec', 'command',
\ ['rg', '--hidden', '--files', '--glob', '!.git', '--glob', '']
\ + zvim#util#Generate_ignore(g:spacevim_wildignore, 'rg')
\ )
elseif executable('ag')
" Change file_rec command.
call denite#custom#var('file_rec', 'command',
" Change file/rec command.
call denite#custom#var('file/rec', 'command',
\ ['ag' , '--nocolor', '--nogroup', '-g', '']
\ + zvim#util#Generate_ignore(g:spacevim_wildignore, 'ag')
\ )
@ -51,13 +51,13 @@ else
if executable('pt')
" For Pt(the platinum searcher)
" NOTE: It also supports windows.
call denite#custom#var('file_rec', 'command',
call denite#custom#var('file/rec', 'command',
\ ['pt', '--nocolor', '--ignore', '.git', '--hidden', '-g=', ''])
endif
endif
call denite#custom#alias('source', 'file_rec/git', 'file_rec')
call denite#custom#var('file_rec/git', 'command',
call denite#custom#alias('source', 'file/rec/git', 'file/rec')
call denite#custom#var('file/rec/git', 'command',
\ ['git', 'ls-files', '-co', '--exclude-standard'])
" FIND and GREP COMMANDS

View File

@ -22,7 +22,7 @@ This layers adds extensive support for [language-server-protocol](https://micros
This layer is a heavy wallpaper of [LanguageClient-neovim](https://github.com/SpaceVim/LanguageClient-neovim) (an old fork),
The upstream is rewritten by rust.
We also include [vim-lsp](https://github.com/prabirshrestha/vim-lsp), which is wrote in pure vim script.
We also include [vim-lsp](https://github.com/prabirshrestha/vim-lsp), which is written in pure vim script.
Note that if `coc` is used as autocomplete method in the `autocomplete` layer,
it will be used as lsp client.