Use gitsigns.nvim to display inline diffs in the "diff1_plain" layout.

Author: sindrets

lua/diffview/actions.lua

@@ -406,6 +406,7 @@ function M.cycle_layout()
     standard = {
       Diff2Hor.__get(),
       Diff2Ver.__get(),
+      Diff1.__get(),
     },
     merge_tool = {
       Diff3Hor.__get(),

lua/diffview/config.lua

@@ -480,7 +480,7 @@ function M.setup(user_config)
   do
     -- Validate layouts
     local view = M._config.view
-    local standard_layouts = { "diff2_horizontal", "diff2_vertical", -1 }
+    local standard_layouts = { "diff2_horizontal", "diff2_vertical", "diff1_plain", -1 }
     local merge_layuots = {
       "diff1_plain",
       "diff3_horizontal",

lua/diffview/scene/file_entry.lua

@@ -120,6 +120,7 @@ function FileEntry:convert_layout(target_layout)
   end
 
   self.layout = target_layout({
+    parent = self,
     a = utils.tbl_access(self.layout, "a.file") or create_file(self.revs.a, "a"),
     b = utils.tbl_access(self.layout, "b.file") or create_file(self.revs.b, "b"),
     c = utils.tbl_access(self.layout, "c.file") or create_file(self.revs.c, "c"),
@@ -203,7 +204,7 @@ function FileEntry.with_layout(layout_class, opt)
     }) --[[@as vcs.File ]]
   end
 
-  return FileEntry({
+  local entry = FileEntry({
     adapter = opt.adapter,
     path = opt.path,
     oldpath = opt.oldpath,
@@ -212,13 +213,17 @@ function FileEntry.with_layout(layout_class, opt)
     kind = opt.kind,
     commit = opt.commit,
     revs = opt.revs,
-    layout = layout_class({
-      a = create_file(opt.revs.a, "a"),
-      b = create_file(opt.revs.b, "b"),
-      c = create_file(opt.revs.c, "c"),
-      d = create_file(opt.revs.d, "d"),
-    }),
   })
+
+  entry.layout = layout_class({
+    parent = entry,
+    a = create_file(opt.revs.a, "a"),
+    b = create_file(opt.revs.b, "b"),
+    c = create_file(opt.revs.c, "c"),
+    d = create_file(opt.revs.d, "d"),
+  })
+
+  return entry
 end
 
 M.FileEntry = FileEntry

lua/diffview/scene/layout.lua

@@ -8,13 +8,15 @@ local api = vim.api
 local M = {}
 
 ---@class Layout : diffview.Object
+---@field parent FileEntry
 ---@field windows Window[]
 ---@field emitter EventEmitter
 ---@field pivot_producer fun(): integer?
 local Layout = oop.create_class("Layout")
 
 function Layout:init(opt)
   opt = opt or {}
+  self.parent = opt.parent
   self.windows = opt.windows or {}
   self.emitter = opt.emitter or EventEmitter()
 

lua/diffview/scene/views/diff/diff_view.lua

@@ -284,7 +284,7 @@ DiffView.get_updated_files = async.wrap(function(self, callback)
       self.path_args,
       self.options,
       {
-        default_layout = DiffView.get_default_diff2(),
+        default_layout = DiffView.get_default_layout(),
         merge_layout = DiffView.get_default_merge_layout(),
       },
       callback

lua/diffview/scene/views/file_history/file_history_panel.lua

@@ -278,7 +278,7 @@ function FileHistoryPanel:update_entries(callback)
 
   finalizer = self.adapter:file_history(
     self.log_options,
-    { default_layout = self.parent.get_default_diff2(), },
+    { default_layout = self.parent.get_default_layout(), },
     update
   )
 

lua/diffview/scene/window.lua

@@ -1,7 +1,9 @@
 local lazy = require("diffview.lazy")
 local oop = require("diffview.oop")
 
+local Diff1 = lazy.access("diffview.scene.layouts.diff_1", "Diff1") ---@type Diff1|LazyModule
 local File = lazy.access("diffview.vcs.file", "File") ---@type vcs.File|LazyModule
+local GitAdapter = lazy.access("diffview.vcs.adapters.git", "GitAdapter") ---@type GitAdapter|LazyModule
 local RevType = lazy.access("diffview.vcs.rev", "RevType") ---@type RevType|LazyModule
 local config = lazy.require("diffview.config") ---@module "diffview.config"
 local lib = lazy.require("diffview.lib") ---@module "diffview.lib"
@@ -87,11 +89,19 @@ function Window:open_file(callback)
         self:_save_winopts()
       end
 
+      local base_rev = utils.tbl_access(self, "parent.parent.revs.a") --[[@as Rev? ]]
+
       self:apply_file_winopts()
       self.file:attach_buffer(false, {
         keymaps = config.get_layout_keymaps(self.parent),
         disable_diagnostics = self.file.kind == "conflicting"
             and config.get_config().view.merge_tool.disable_diagnostics,
+        inline_diff = {
+          enable = self.file.kind ~= "conflicting"
+              and self.parent:instanceof(Diff1.__get())
+              and self.file.adapter:instanceof(GitAdapter.__get()),
+          base = base_rev and base_rev:object_name(),
+        }
       })
 
       api.nvim_win_call(self.id, function()

lua/diffview/vcs/file.lua

@@ -5,10 +5,16 @@ local GitRev = lazy.access("diffview.vcs.adapters.git.rev", "GitRev") ---@type G
 local RevType = lazy.access("diffview.vcs.rev", "RevType") ---@type RevType|LazyModule
 local async = lazy.require("plenary.async") ---@module "plenary.async"
 local config = lazy.require("diffview.config") ---@module "diffview.config"
+local gs_actions = lazy.require("gitsigns.actions") ---@module "gitsigns.actions"
 local utils = lazy.require("diffview.utils") ---@module "diffview.utils"
+local debounce = lazy.require("diffview.debounce") ---@module "diffview.debounce"
 
 local pl = lazy.access(utils, "path") ---@type PathLib|LazyModule
 
+local gs_refresh = debounce.debounce_trailing(20, false, vim.schedule_wrap(function()
+  gs_actions.refresh()
+end))
+
 local api = vim.api
 local M = {}
 
@@ -251,36 +257,21 @@ function File:is_valid()
   return self.bufnr and api.nvim_buf_is_valid(self.bufnr)
 end
 
----@param force? boolean
----@param opt? vcs.File.AttachState
-function File:attach_buffer(force, opt)
-  if self.bufnr then
-    File._attach_buffer(self.bufnr, force, opt)
-  end
-end
-
-function File:detach_buffer()
-  if self.bufnr then
-    File._detach_buffer(self.bufnr)
-  end
-end
-
-function File:dispose_buffer()
-  if self.bufnr and api.nvim_buf_is_loaded(self.bufnr) then
-    File._detach_buffer(self.bufnr)
-    File.safe_delete_buf(self.bufnr)
-    self.bufnr = nil
-  end
-end
-
 ---@param t1 table
 ---@param t2 table
 ---@return vcs.File.AttachState
 local function prepare_attach_opt(t1, t2)
-  local res = vim.tbl_extend("keep", t1, {
+  ---@class vcs.File.AttachState
+  local default_opt = {
     keymaps = {},
     disable_diagnostics = false,
-  })
+    inline_diff = {
+      enable = false,
+      base = nil --[[@as string? ]],
+    }
+  }
+
+  local res = vim.tbl_extend("force", default_opt, t1)
 
   for k, v in pairs(t2) do
     local t = type(res[k])
@@ -297,68 +288,98 @@ local function prepare_attach_opt(t1, t2)
   return res
 end
 
----@class vcs.File.AttachState
----@field keymaps table
----@field disable_diagnostics boolean
-
----@static
----@param bufnr integer
 ---@param force? boolean
 ---@param opt? vcs.File.AttachState
-function File._attach_buffer(bufnr, force, opt)
-  local new_opt = false
-  local cur_state = File.attached[bufnr] or {}
-  local state = prepare_attach_opt(cur_state, opt or {})
+function File:attach_buffer(force, opt)
+  if self.bufnr then
+    local new_opt = false
+    local cur_state = File.attached[self.bufnr] or {}
+    local state = prepare_attach_opt(cur_state, opt or {})
 
-  if opt then
-    new_opt = not vim.deep_equal(cur_state or {}, opt)
-  end
+    if opt then
+      new_opt = not vim.deep_equal(cur_state or {}, opt)
+    end
 
-  if force or new_opt or not cur_state then
-    local conf = config.get_config()
+    if force or new_opt or not cur_state then
+      local conf = config.get_config()
 
-    -- Keymaps
-    state.keymaps = config.extend_keymaps(conf.keymaps.view, state.keymaps)
-    local default_map_opt = { silent = true, nowait = true, buffer = bufnr }
+      -- Keymaps
+      state.keymaps = config.extend_keymaps(conf.keymaps.view, state.keymaps)
+      local default_map_opt = { silent = true, nowait = true, buffer = self.bufnr }
 
-    for _, mapping in ipairs(state.keymaps) do
-      local map_opt = vim.tbl_extend("force", default_map_opt, mapping[4] or {}, { buffer = bufnr })
-      vim.keymap.set(mapping[1], mapping[2], mapping[3], map_opt)
-    end
+      for _, mapping in ipairs(state.keymaps) do
+        local map_opt = vim.tbl_extend("force", default_map_opt, mapping[4] or {}, { buffer = self.bufnr })
+        vim.keymap.set(mapping[1], mapping[2], mapping[3], map_opt)
+      end
 
-    -- Diagnostics
-    if state.disable_diagnostics then
-      vim.diagnostic.disable(bufnr)
-    end
+      -- Diagnostics
+      if state.disable_diagnostics then
+        vim.diagnostic.disable(self.bufnr)
+      end
+
+      -- Inline diff
+      if state.inline_diff.enable then
+        local gitsigns = require("gitsigns")
+        local gs_config = require("gitsigns.config").config
+        gitsigns.attach(self.bufnr, {
+          file = self.path,
+          toplevel = self.adapter.ctx.toplevel,
+          gitdir = self.adapter.ctx.dir,
+          commit = self.rev.type ~= RevType.LOCAL and self.rev:object_name() or nil,
+          base = utils.sate(state.inline_diff.base, self.rev.type == RevType.STAGE and "HEAD"),
+        })
+        gs_config.linehl = true
+        gs_config.show_deleted = true
+        gs_config.word_diff = true
+        gs_refresh()
+      end
 
-    File.attached[bufnr] = state
+      File.attached[self.bufnr] = state
+    end
   end
 end
 
----@static
----@param bufnr integer
-function File._detach_buffer(bufnr)
-  local state = File.attached[bufnr]
-
-  if state then
-    -- Keymaps
-    for lhs, mapping in pairs(state.keymaps) do
-      if type(lhs) == "number" then
-        local modes = type(mapping[1]) == "table" and mapping[1] or { mapping[1] }
-        for _, mode in ipairs(modes) do
-          pcall(api.nvim_buf_del_keymap, bufnr, mode, mapping[2])
+function File:detach_buffer()
+  if self.bufnr then
+    local state = File.attached[self.bufnr]
+
+    if state then
+      -- Keymaps
+      for lhs, mapping in pairs(state.keymaps) do
+        if type(lhs) == "number" then
+          local modes = type(mapping[1]) == "table" and mapping[1] or { mapping[1] }
+          for _, mode in ipairs(modes) do
+            pcall(api.nvim_buf_del_keymap, self.bufnr, mode, mapping[2])
+          end
+        else
+          pcall(api.nvim_buf_del_keymap, self.bufnr, "n", lhs)
         end
-      else
-        pcall(api.nvim_buf_del_keymap, bufnr, "n", lhs)
       end
-    end
 
-    -- Diagnostics
-    if state.disable_diagnostics then
-      vim.diagnostic.enable(bufnr)
+      -- Diagnostics
+      if state.disable_diagnostics then
+        vim.diagnostic.enable(self.bufnr)
+      end
+
+      -- Inline diff
+      if state.inline_diff.enable then
+        local gs_config = require("gitsigns.config").config
+        gs_config.linehl = false
+        gs_config.show_deleted = false
+        gs_config.word_diff = false
+        gs_refresh()
+      end
+
+      File.attached[self.bufnr] = nil
     end
+  end
+end
 
-    File.attached[bufnr] = nil
+function File:dispose_buffer()
+  if self.bufnr and api.nvim_buf_is_loaded(self.bufnr) then
+    self:detach_buffer()
+    File.safe_delete_buf(self.bufnr)
+    self.bufnr = nil
   end
 end
 
@@ -400,7 +421,7 @@ end
 function File.load_null_buffer(winid)
   local bn = File._get_null_buffer()
   api.nvim_win_set_buf(winid, bn)
-  File._attach_buffer(bn)
+  File.NULL_FILE:attach_buffer()
 end
 
 ---@type vcs.File