Revert "chore: simplify vimgrep_arguments args (#2440)" (#2488)

This reverts commit cfe6df6. (cherry picked from commit d77b37f)
nvim-telescope · May 14, 2023 · 37fa401 · 37fa401
1 parent 05b42da
commit 37fa401
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/doc/telescope.txt b/doc/telescope.txt
@@ -527,13 +527,16 @@ telescope.setup({opts}) *telescope.setup()*
  Hint: Make sure that color is currently set to `never` because we do
  not yet interpret color codes
  Hint 2: Make sure that these options are in your changes arguments:
- ("--no-heading", "--with-filename", "--line-number", "--column") or
- "--vimgrep"
+ "--no-heading", "--with-filename", "--line-number", "--column"
  because we need them so the ripgrep output is in the correct format.
 
  Default: {
  "rg",
- "--vimgrep",
+ "--color=never",
+ "--no-heading",
+ "--with-filename",
+ "--line-number",
+ "--column",
  "--smart-case"
  }
 

diff --git a/lua/telescope/config.lua b/lua/telescope/config.lua
@@ -620,20 +620,23 @@ append(
 
 append(
  "vimgrep_arguments",
- { "rg", "--vimgrep", "--smart-case" },
+ { "rg", "--color=never", "--no-heading", "--with-filename", "--line-number", "--column", "--smart-case" },
  [[
  Defines the command that will be used for `live_grep` and `grep_string`
  pickers.
  Hint: Make sure that color is currently set to `never` because we do
  not yet interpret color codes
  Hint 2: Make sure that these options are in your changes arguments:
- ("--no-heading", "--with-filename", "--line-number", "--column") or
- "--vimgrep"
+ "--no-heading", "--with-filename", "--line-number", "--column"
  because we need them so the ripgrep output is in the correct format.
 
  Default: {
  "rg",
- "--vimgrep",
+ "--color=never",
+ "--no-heading",
+ "--with-filename",
+ "--line-number",
+ "--column",
  "--smart-case"
  }]]
 )