From 37fa4010406231084eeed3d37aa8b246eb2a13af Mon Sep 17 00:00:00 2001
From: James Trew <66286082+jamestrew@users.noreply.github.com>
Date: Sun, 7 May 2023 00:47:52 -0400
Subject: [PATCH] Revert "chore: simplify vimgrep_arguments args (#2440)"
 (#2488)

This reverts commit cfe6df6257aa7ee691fb56305923e9fec6c83c97.

(cherry picked from commit d77b37f4520e5fc2cf4c74c12e42ed4b589bd367)
---
 doc/telescope.txt        |  9 ++++++---
 lua/telescope/config.lua | 11 +++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/doc/telescope.txt b/doc/telescope.txt
index f0c030a..ac52b7e 100644
--- 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
index afe7d82..9706933 100644
--- 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"
     }]]
 )