Migrate from the silver searcher to ripgrep

This commit is contained in:
Steven Barragán
2016-12-31 13:04:35 -06:00
parent 3fa9e6f636
commit 956c0ed4df
7 changed files with 20 additions and 17 deletions

View File

@@ -96,7 +96,7 @@ Read on to learn what YADR provides!
Homebrew is _the missing package manager for OSX_. Installed automatically. Homebrew is _the missing package manager for OSX_. Installed automatically.
We automatically install a few useful packages including ctags, git, macvim, hub, and the silver searcher ('ag') We automatically install a few useful packages including ctags, git, macvim, hub, and RipGrep ('rg')
Note that our autocomplete plugin requires a MacVim that supports Lua. The installer knows how to install it, but if you had one installed before, you may need to manually remove your old MacVim. Note that our autocomplete plugin requires a MacVim that supports Lua. The installer knows how to install it, but if you had one installed before, you may need to manually remove your old MacVim.
### ZSH ### ZSH
@@ -190,7 +190,7 @@ of plugins above to learn more.
* `,K` - Grep the current word up to next exclamation point (useful for ruby foo! methods) * `,K` - Grep the current word up to next exclamation point (useful for ruby foo! methods)
* `Cmd-*` - highlight all occurrences of current word (similar to regular `*` except doesn't move) * `Cmd-*` - highlight all occurrences of current word (similar to regular `*` except doesn't move)
* `,hl` - toggle search highlight on and off * `,hl` - toggle search highlight on and off
* `,gg` or `,ag` - Grep command line, type between quotes. Uses Ag Silver Searcher. * `,gg` or `,rg` - Grep command line, type between quotes. Uses RipGrep.
* After searching with `,gg` you can navigate the results with `Ctrl-x` and `Ctrl-z` (or standard vim `:cn` and `:cp`) * After searching with `,gg` you can navigate the results with `Ctrl-x` and `Ctrl-z` (or standard vim `:cn` and `:cp`)
* `,gd` - Grep def (greps for 'def [function name]') when cursor is over the function name * `,gd` - Grep def (greps for 'def [function name]') when cursor is over the function name
* `,gcf` - Grep Current File to find references to the current file * `,gcf` - Grep Current File to find references to the current file

View File

@@ -172,7 +172,7 @@ def install_homebrew
puts "======================================================" puts "======================================================"
puts "Installing Homebrew packages...There may be some warnings." puts "Installing Homebrew packages...There may be some warnings."
puts "======================================================" puts "======================================================"
run %{brew install zsh ctags git hub tmux reattach-to-user-namespace the_silver_searcher ghi hub} run %{brew install zsh ctags git hub tmux reattach-to-user-namespace ripgrep ghi hub}
run %{brew install macvim --custom-icons --with-override-system-vim --with-lua --with-luajit} run %{brew install macvim --custom-icons --with-override-system-vim --with-lua --with-luajit}
puts puts
puts puts

View File

@@ -10,5 +10,5 @@
* color_highlight - use :ColorCodes to see hex colors highlighted * color_highlight - use :ColorCodes to see hex colors highlighted
* change-inside-surroundings - change content inside delimiters like quotes/brackets * change-inside-surroundings - change content inside delimiters like quotes/brackets
* rspec.vim - used for color highlighting rspec correctly even if specs live outside of spec/ (rails.vim doesn't handle this) * rspec.vim - used for color highlighting rspec correctly even if specs live outside of spec/ (rails.vim doesn't handle this)
* Ag - use :Ag to search across multiple files. Faster than Grep and Ack. * Rg - use :Rg to search across multiple files. Faster than Ag, Grep and Ack.
* vim-session: use `:SaveSession` and `:OpenSession` to come back to your saved window layout * vim-session: use `:SaveSession` and `:OpenSession` to come back to your saved window layout

View File

@@ -1,12 +1,12 @@
if exists("g:ctrlp_user_command") if exists("g:ctrlp_user_command")
unlet g:ctrlp_user_command unlet g:ctrlp_user_command
endif endif
if executable('ag')
" Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
let g:ctrlp_user_command =
\ 'ag %s --files-with-matches -g "" --ignore "\.git$\|\.hg$\|\.svn$"'
" ag is fast enough that CtrlP doesn't need to cache if executable('rg')
" Use rg in CtrlP for listing files. Lightning fast and respects .gitignore
let g:ctrlp_user_command = 'rg --files --smart-case %s'
" rg is fast enough that CtrlP doesn't need to cache
let g:ctrlp_use_caching = 0 let g:ctrlp_use_caching = 0
else else
" Fall back to using git ls-files if Ag is not available " Fall back to using git ls-files if Ag is not available

3
vim/settings/ripgrep.vim Normal file
View File

@@ -0,0 +1,3 @@
" Open the Rg command and place the cursor into the quotes
nmap ,rg :Rg ""<Left>
nmap ,rf :Rg --files ""<Left>

View File

@@ -11,20 +11,20 @@ function! GetVisual()
endfunction endfunction
"grep the current word using K (mnemonic Kurrent) "grep the current word using K (mnemonic Kurrent)
nnoremap <silent> K :Ag <cword><CR> nnoremap <silent> K :Rg <cword><CR>
"grep visual selection "grep visual selection
vnoremap K :<C-U>execute "Ag " . GetVisual()<CR> vnoremap K :<C-U>execute "Rg " . GetVisual()<CR>
"grep current word up to the next exclamation point using ,K "grep current word up to the next exclamation point using ,K
nnoremap ,K viwf!:<C-U>execute "Ag " . GetVisual()<CR> nnoremap ,K viwf!:<C-U>execute "Rg " . GetVisual()<CR>
"grep for 'def foo' "grep for 'def foo'
nnoremap <silent> ,gd :Ag 'def <cword>'<CR> nnoremap <silent> ,gd :Rg 'def <cword>'<CR>
",gg = Grep! - using Ag the silver searcher ",gg = Grep! - using Rg RipGrep
" open up a grep line, with a quote started for the search " open up a grep line, with a quote started for the search
nnoremap ,gg :Ag ""<left> nnoremap ,gg :Rg ""<left>
"Grep for usages of the current file "Grep for usages of the current file
nnoremap ,gcf :exec "Ag " . expand("%:t:r")<CR> nnoremap ,gcf :exec "Rg " . expand("%:t:r")<CR>

View File

@@ -1,5 +1,5 @@
Bundle "justinmk/vim-sneak" Bundle "justinmk/vim-sneak"
Bundle "rking/ag.vim" Bundle "jremmen/vim-ripgrep"
Bundle "henrik/vim-indexed-search" Bundle "henrik/vim-indexed-search"
Bundle "nelstrom/vim-visual-star-search" Bundle "nelstrom/vim-visual-star-search"
Bundle "skwp/greplace.vim" Bundle "skwp/greplace.vim"