Update vscode-diff to codediff

Author: CKolkey

README.md

@@ -36,7 +36,7 @@ Here's an example spec for [Lazy](https://github.com/folke/lazy.nvim), but you'r
 
     -- Only one of these is needed.
     "sindrets/diffview.nvim",        -- optional
-    "ldelossa/vscode-diff.nvim",     -- optional
+    "esmuellert/codediff.nvim",      -- optional
 
     -- Only one of these is needed.
     "nvim-telescope/telescope.nvim", -- optional
@@ -323,8 +323,8 @@ neogit.setup {
     diffview = nil,
 
     -- Alternative diff viewer integration.
-    -- Requires you to have `ldelossa/vscode-diff.nvim` installed.
-    vscode_diff = nil,
+    -- Requires you to have `esmuellert/codediff.nvim` installed.
+    codediff = nil,
 
     -- If enabled, uses fzf-lua for menu selection. If the telescope integration
     -- is also selected then telescope is used instead
@@ -341,8 +341,8 @@ neogit.setup {
     -- Requires you to have `folke/snacks.nvim` installed.
     snacks = nil,
   },
-  -- Which diff viewer to use. nil = auto-detect (tries diffview first, then vscode_diff).
-  -- Can be "diffview" or "vscode_diff".
+  -- Which diff viewer to use. nil = auto-detect (tries diffview first, then codediff).
+  -- Can be "diffview" or "codediff".
   diff_viewer = nil,
   sections = {
     -- Reverting/Cherry Picking

doc/neogit.txt

@@ -286,8 +286,8 @@ to Neovim users.
         diffview = nil,
 
         -- Alternative diff viewer integration.
-        -- Requires you to have `ldelossa/vscode-diff.nvim` installed.
-        vscode_diff = nil,
+        -- Requires you to have `esmuellert/codediff.nvim` installed.
+        codediff = nil,
 
         -- If enabled, uses fzf-lua for menu selection. If the telescope integration
         -- is also selected then telescope is used instead
@@ -304,8 +304,8 @@ to Neovim users.
         -- Requires you to have `folke/snacks.nvim` installed.
         snacks = nil,
     },
-    -- Which diff viewer to use. nil = auto-detect (tries diffview first, then vscode_diff).
-    -- Can be "diffview" or "vscode_diff".
+    -- Which diff viewer to use. nil = auto-detect (tries diffview first, then codediff).
+    -- Can be "diffview" or "codediff".
     diff_viewer = nil,
     sections = {
         -- Reverting/Cherry Picking
@@ -1411,7 +1411,7 @@ ref range.
 For these actions to become available, Neogit needs to have a diff viewer
 integration enabled. Supported viewers are:
 - `diffview.nvim`: https://github.com/sindrets/diffview.nvim
-- `vscode-diff.nvim`: https://github.com/ldelossa/vscode-diff.nvim
+- `codediff.nvim`: https://github.com/esmuellert/codediff.nvim
 
 By default, Neogit will auto-detect which viewer is available. You can
 explicitly set the viewer with the `diff_viewer` option. See |neogit_setup_plugin|.

lua/neogit/config.lua

@@ -387,8 +387,8 @@ end
 ---@field preview_buffer? NeogitConfigPopup Preview options
 ---@field popup? NeogitConfigPopup Set the default way of opening popups
 ---@field signs? NeogitConfigSigns Signs used for toggled regions
----@field integrations? { diffview: boolean, vscode_diff: boolean, telescope: boolean, fzf_lua: boolean, mini_pick: boolean, snacks: boolean } Which integrations to enable
----@field diff_viewer? "diffview"|"vscode_diff"|nil Which diff viewer to use (nil = auto-detect)
+---@field integrations? { diffview: boolean, codediff: boolean, telescope: boolean, fzf_lua: boolean, mini_pick: boolean, snacks: boolean } Which integrations to enable
+---@field diff_viewer? "diffview"|"codediff"|nil Which diff viewer to use (nil = auto-detect)
 ---@field sections? NeogitConfigSections
 ---@field ignored_settings? string[] Settings to never persist, format: "Filetype--cli-value", i.e. "NeogitCommitPopup--author"
 ---@field mappings? NeogitConfigMappings
@@ -541,7 +541,7 @@ function M.get_default_values()
     integrations = {
       telescope = nil,
       diffview = nil,
-      vscode_diff = nil,
+      codediff = nil,
       fzf_lua = nil,
       mini_pick = nil,
       snacks = nil,
@@ -864,7 +864,7 @@ function M.validate_config()
       return
     end
 
-    local valid_viewers = { "diffview", "vscode_diff" }
+    local valid_viewers = { "diffview", "codediff" }
     if not vim.tbl_contains(valid_viewers, config.diff_viewer) then
       err(
         "diff_viewer",
@@ -878,7 +878,7 @@ function M.validate_config()
   end
 
   local function validate_integrations()
-    local valid_integrations = { "diffview", "vscode_diff", "telescope", "fzf_lua", "mini_pick", "snacks" }
+    local valid_integrations = { "diffview", "codediff", "telescope", "fzf_lua", "mini_pick", "snacks" }
     if not validate_type(config.integrations, "integrations", "table") or #config.integrations == 0 then
       return
     end
@@ -1331,7 +1331,7 @@ function M.check_integration(name)
 end
 
 ---Returns the configured diff viewer, or auto-detects if not set
----@return string|nil The diff viewer to use ("diffview", "vscode_diff"), or nil if none available
+---@return string|nil The diff viewer to use ("diffview", "codediff"), or nil if none available
 function M.get_diff_viewer()
   local logger = require("neogit.logger")
   local viewer = M.values.diff_viewer

lua/neogit/popups/diff/actions.lua

@@ -4,7 +4,7 @@ local FuzzyFinderBuffer = require("neogit.buffers.fuzzy_finder")
 
 local function get_diff_integration()
   local viewer = config.get_diff_viewer()
-  if viewer == "vscode_diff" then
+  if viewer == "codediff" then
     return require("neogit.integrations.codediff")
   else
     return require("neogit.integrations.diffview")