Adress naming issues

lua/telescope/builtin/git.lua

@@ -48,8 +48,8 @@ git.commits = function(opts)
       results = results,
       entry_maker = opts.entry_maker or make_entry.gen_from_git_commits(opts),
     },
-    previewer = previewers.git_commit_diff_to_parent.new(opts),
-    alt_previewers = {
+    previewer = {
+      previewers.git_commit_diff_to_parent.new(opts),
       previewers.git_commit_diff_to_head.new(opts),
       previewers.git_commit_diff_as_was.new(opts),
       previewers.git_commit_message.new(opts),
@@ -80,8 +80,8 @@ git.bcommits = function(opts)
       results = results,
       entry_maker = opts.entry_maker or make_entry.gen_from_git_commits(opts),
     },
-    previewer = previewers.git_commit_diff_to_parent.new(opts),
-    alt_previewers = {
+    previewer = {
+      previewers.git_commit_diff_to_parent.new(opts),
       previewers.git_commit_diff_to_head.new(opts),
       previewers.git_commit_diff_as_was.new(opts),
       previewers.git_commit_message.new(opts),
@@ -93,21 +93,22 @@ git.bcommits = function(opts)
         return opts.current_file and path.make_relative(opts.current_file, opts.cwd)
       end
 
-      local get_og = function(selection)
+      local get_buffer_of_orig = function(selection)
         local value = selection.value .. ':' .. transfrom_file()
-        return utils.get_os_command_output({ 'git', '--no-pager', 'show', value }, opts.cwd)
+        local content = utils.get_os_command_output({ 'git', '--no-pager', 'show', value }, opts.cwd)
+
+        local bufnr = vim.api.nvim_create_buf(false, true)
+        vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, content)
+        vim.api.nvim_buf_set_name(bufnr, 'Original')
+        return bufnr
       end
 
       local vimdiff = function(selection, command)
         local ft = vim.bo.filetype
         vim.cmd("diffthis")
-        local content = get_og(selection)
-        vim.cmd(command)
 
-        local bufnr = vim.api.nvim_create_buf(false, true)
-        vim.api.nvim_win_set_buf(0, bufnr)
-        vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, content)
-        vim.api.nvim_buf_set_name(bufnr, 'Git Diff')
+        local bufnr = get_buffer_of_orig(selection)
+        vim.cmd(string.format("%s %s", command, bufnr))
         vim.bo.filetype = ft
         vim.cmd("diffthis")
 
@@ -120,20 +121,20 @@ git.bcommits = function(opts)
       actions.select_vertical:replace(function(prompt_bufnr)
         actions.close(prompt_bufnr)
         local selection = action_state.get_selected_entry()
-        vimdiff(selection, 'leftabove vnew')
+        vimdiff(selection, 'leftabove vert sbuffer')
       end)
 
       actions.select_horizontal:replace(function(prompt_bufnr)
         actions.close(prompt_bufnr)
         local selection = action_state.get_selected_entry()
-        vimdiff(selection, 'belowright new')
+        vimdiff(selection, 'belowright sbuffer')
       end)
 
       actions.select_tab:replace(function(prompt_bufnr)
         actions.close(prompt_bufnr)
         local selection = action_state.get_selected_entry()
         vim.cmd('tabedit ' .. transfrom_file())
-        vimdiff(selection, 'leftabove vnew')
+        vimdiff(selection, 'leftabove vert sbuffer')
       end)
       return true
     end

lua/telescope/pickers.lua

@@ -69,8 +69,7 @@ function Picker:new(opts)
     finder = opts.finder,
     sorter = opts.sorter,
 
-    previewer = opts.previewer,
-    all_previewers = opts.alt_previewers or {},
+    all_previewers = opts.previewer,
     current_previewer_index = 1,
 
     default_selection_index = opts.default_selection_index,
@@ -120,7 +119,14 @@ function Picker:new(opts)
     preview_cutoff = get_default(opts.preview_cutoff, config.values.preview_cutoff),
   }, self)
 
-  table.insert(obj.all_previewers, 1, obj.previewer)
+  if obj.all_previewers ~= nil and obj.all_previewers ~= false then
+    if obj.all_previewers[1] == nil then
+      obj.all_previewers = { obj.all_previewers }
+    end
+    obj.previewer = obj.all_previewers[1]
+  else
+    obj.previewer = false
+  end
 
   obj.scroller = p_scroller.create(
     get_default(opts.scroll_strategy, config.values.scroll_strategy),

lua/telescope/previewers/init.lua

@@ -135,7 +135,6 @@ previewers.qflist = term_previewer.qflist
 ---
 --- In the following options, state table and general tips are mentioned to
 --- make your experience with this previewer more seamless.
---- Deprecated previewers
 ---
 ---
 --- options: