feat(config): add options visual appearance options

Author: dlyongemallo

doc/diffview.txt

@@ -785,6 +785,14 @@ file_panel                                      *diffview-config-file_panel*
                   contain a single directory. Default: `true`
                 • {folder_statuses} ("never"|"only_folded"|"always")
                   Show folder statuses. Default: `"only_folded"`
+                • {folder_count_style} ("grouped"|"simple")
+                  How to display file counts on collapsed folders.
+                  `"grouped"` shows per-status counts (e.g. "2M 1D"),
+                  `"simple"` shows a plain total (e.g. "3").
+                  Default: `"grouped"`
+                • {folder_trailing_slash} (boolean)
+                  Append "/" to folder names in the file tree.
+                  Default: `true`
 
             {win_config} (table|function)
                 See |diffview-config-win_config|.
@@ -815,6 +823,12 @@ file_history_panel                              *diffview-config-file_history_pa
                 "5, 3", `"bar"` shows e.g. "| 8 +++++---". Default:
                 `"number"`
 
+            {subject_highlight} ("ref_aware"|"plain")
+                How to highlight commit subjects. `"ref_aware"` uses
+                different colours for pushed vs unpushed commits.
+                `"plain"` uses a single colour for all.
+                Default: `"ref_aware"`
+
             {commit_format} (string[])
                 Ordered list of components to show for each commit entry.
                 Available components: `"status"`, `"files"`, `"stats"`,

doc/diffview_defaults.txt

@@ -89,6 +89,8 @@ DEFAULT CONFIG                                  *diffview.defaults*
       tree_options = {                    -- Only applies when listing_style is 'tree'
         flatten_dirs = true,              -- Flatten dirs that only contain one single dir
         folder_statuses = "only_folded",  -- One of 'never', 'only_folded' or 'always'.
+        folder_count_style = "grouped",   -- "grouped" (e.g. "2M 1D") or "simple" (e.g. "3").
+        folder_trailing_slash = true,     -- Append "/" to folder names in the file tree.
       },
       win_config = {                      -- See |diffview-config-win_config|
         position = "left",
@@ -102,6 +104,7 @@ DEFAULT CONFIG                                  *diffview.defaults*
     },
     file_history_panel = {
       stat_style = "number",              -- "number" (e.g. "5, 3"), "bar" (e.g. "| 8 +++++---"), or "both".
+      subject_highlight = "ref_aware",    -- "ref_aware" (colour by pushed/unpushed) or "plain".
       -- Ordered list of components to show for each commit entry.
       -- Available: "status", "files", "stats", "hash", "reflog", "ref", "subject", "author", "date"
       commit_format = { "status", "files", "stats", "hash", "reflog", "ref", "subject", "author", "date" },

lua/diffview/config.lua

@@ -152,7 +152,9 @@ M.defaults = {
     sort_file = nil, -- Custom file comparator: function(a_name, b_name, a_data, b_data) -> boolean
     tree_options = {
       flatten_dirs = true,
-      folder_statuses = "only_folded"
+      folder_statuses = "only_folded",
+      folder_count_style = "grouped", -- "grouped" (e.g. "2M 1D") or "simple" (e.g. "3").
+      folder_trailing_slash = true, -- Append "/" to folder names in the file tree.
     },
     win_config = {
       position = "left",
@@ -166,6 +168,7 @@ M.defaults = {
   },
   file_history_panel = {
     stat_style = "number", -- "number" (e.g. "5, 3"), "bar" (e.g. "| 8 +++++---"), or "both".
+    subject_highlight = "ref_aware", -- "ref_aware" (colour by pushed/unpushed) or "plain".
     -- Ordered list of components to show for each commit entry.
     -- Available: "status", "files", "stats", "hash", "reflog", "ref", "subject", "author", "date"
     commit_format = { "status", "files", "stats", "hash", "reflog", "ref", "subject", "author", "date" },

lua/diffview/scene/views/diff/file_panel.lua

@@ -9,6 +9,8 @@ local M = {}
 ---@class TreeOptions
 ---@field flatten_dirs boolean
 ---@field folder_statuses "never"|"only_folded"|"always"
+---@field folder_count_style "grouped"|"simple"
+---@field folder_trailing_slash boolean
 
 ---@class FilePanel : Panel
 ---@field adapter VCSAdapter

lua/diffview/scene/views/diff/render.lua

@@ -161,28 +161,34 @@ local function render_file_tree_recurse(conf, panel, depth, comp)
     "DiffviewFolderSign"
   )
 
-  dir:add_text(ctx.name .. "/", "DiffviewFolderName")
-  -- Show file count grouped by status when folder is collapsed.
+  local tree_options = conf.file_panel.tree_options
+  dir:add_text(ctx.name .. (tree_options.folder_trailing_slash and "/" or ""), "DiffviewFolderName")
+  -- Show file count when folder is collapsed.
   if ctx.collapsed and ctx._node then
-    local leaves = ctx._node:leaves()
-    local status_counts = {}
-    for _, node in ipairs(leaves) do
-      local s = node.data.status or "?"
-      status_counts[s] = (status_counts[s] or 0) + 1
-    end
+    if tree_options.folder_count_style == "grouped" then
+      local leaves = ctx._node:leaves()
+      local status_counts = {}
+      for _, node in ipairs(leaves) do
+        local s = node.data.status or "?"
+        status_counts[s] = (status_counts[s] or 0) + 1
+      end
 
-    -- Sort status letters for consistent display order.
-    local statuses = vim.tbl_keys(status_counts)
-    table.sort(statuses)
+      -- Sort status letters for consistent display order.
+      local statuses = vim.tbl_keys(status_counts)
+      table.sort(statuses)
 
-    dir:add_text(" (", "DiffviewDim1")
-    for i, s in ipairs(statuses) do
-      if i > 1 then
-        dir:add_text(" ", "DiffviewDim1")
+      dir:add_text(" (", "DiffviewDim1")
+      for i, s in ipairs(statuses) do
+        if i > 1 then
+          dir:add_text(" ", "DiffviewDim1")
+        end
+        dir:add_text(tostring(status_counts[s]) .. hl.get_status_icon(s), hl.get_git_hl(s))
       end
-      dir:add_text(tostring(status_counts[s]) .. hl.get_status_icon(s), hl.get_git_hl(s))
+      dir:add_text(")", "DiffviewDim1")
+    else
+      local file_count = #ctx._node:leaves()
+      dir:add_text(" (" .. file_count .. ")", "DiffviewDim1")
     end
-    dir:add_text(")", "DiffviewDim1")
   end
   dir:ln()
 

lua/diffview/scene/views/file_history/render.lua

@@ -180,10 +180,12 @@ local formatters = {
     local subject_hl
     if ctx.panel.cur_item[1] == entry then
       subject_hl = "DiffviewFilePanelSelected"
-    elseif entry.has_remote_ref then
+    elseif ctx.conf.file_history_panel.subject_highlight == "ref_aware" and entry.has_remote_ref then
       subject_hl = "DiffviewCommitRemoteRef"
-    else
+    elseif ctx.conf.file_history_panel.subject_highlight == "ref_aware" then
       subject_hl = "DiffviewCommitLocalOnly"
+    else
+      subject_hl = "DiffviewFilePanelFileName"
     end
 
     comp:add_text(" " .. subject, subject_hl)

lua/diffview/tests/functional/file_history_render_spec.lua

@@ -340,6 +340,69 @@ describe("file_history_render", function()
     end)
   end)
 
+  -- -----------------------------------------------------------------------
+  -- subject_highlight
+  -- -----------------------------------------------------------------------
+
+  describe("subject_highlight", function()
+    ---Replicate the subject highlight selection logic from render.lua.
+    ---@param conf table
+    ---@param entry table
+    ---@param is_selected boolean
+    ---@return string
+    local function resolve_subject_hl(conf, entry, is_selected)
+      if is_selected then
+        return "DiffviewFilePanelSelected"
+      elseif conf.file_history_panel.subject_highlight == "ref_aware" and entry.has_remote_ref then
+        return "DiffviewCommitRemoteRef"
+      elseif conf.file_history_panel.subject_highlight == "ref_aware" then
+        return "DiffviewCommitLocalOnly"
+      else
+        return "DiffviewFilePanelFileName"
+      end
+    end
+
+    it("uses DiffviewFilePanelFileName for 'plain' mode", function()
+      local conf = config.get_config()
+      conf.file_history_panel.subject_highlight = "plain"
+      config.setup(conf)
+
+      local entry = { has_remote_ref = true }
+      eq("DiffviewFilePanelFileName", resolve_subject_hl(config.get_config(), entry, false))
+    end)
+
+    it("uses DiffviewCommitRemoteRef for 'ref_aware' with remote ref", function()
+      local conf = config.get_config()
+      conf.file_history_panel.subject_highlight = "ref_aware"
+      config.setup(conf)
+
+      local entry = { has_remote_ref = true }
+      eq("DiffviewCommitRemoteRef", resolve_subject_hl(config.get_config(), entry, false))
+    end)
+
+    it("uses DiffviewCommitLocalOnly for 'ref_aware' without remote ref", function()
+      local conf = config.get_config()
+      conf.file_history_panel.subject_highlight = "ref_aware"
+      config.setup(conf)
+
+      local entry = { has_remote_ref = false }
+      eq("DiffviewCommitLocalOnly", resolve_subject_hl(config.get_config(), entry, false))
+    end)
+
+    it("uses DiffviewFilePanelSelected when entry is selected", function()
+      local conf = config.get_config()
+      conf.file_history_panel.subject_highlight = "ref_aware"
+      config.setup(conf)
+
+      local entry = { has_remote_ref = true }
+      eq("DiffviewFilePanelSelected", resolve_subject_hl(config.get_config(), entry, true))
+    end)
+
+    it("defaults to 'ref_aware'", function()
+      eq("ref_aware", config.get_config().file_history_panel.subject_highlight)
+    end)
+  end)
+
   -- -----------------------------------------------------------------------
   -- date_format config default
   -- -----------------------------------------------------------------------

lua/diffview/tests/functional/panel_render_spec.lua

@@ -269,6 +269,41 @@ describe("panel_render", function()
     end)
   end)
 
+  -- -----------------------------------------------------------------------
+  -- folder_trailing_slash
+  -- -----------------------------------------------------------------------
+
+  describe("folder_trailing_slash option", function()
+    ---Replicate the folder-name rendering logic from render.lua.
+    ---@param conf table
+    ---@param name string
+    ---@return string
+    local function render_folder_name(conf, name)
+      local tree_options = conf.file_panel.tree_options
+      return name .. (tree_options.folder_trailing_slash and "/" or "")
+    end
+
+    it("appends trailing slash when enabled", function()
+      local conf = config.get_config()
+      conf.file_panel.tree_options.folder_trailing_slash = true
+      config.setup(conf)
+
+      eq("src/", render_folder_name(config.get_config(), "src"))
+    end)
+
+    it("omits trailing slash when disabled", function()
+      local conf = config.get_config()
+      conf.file_panel.tree_options.folder_trailing_slash = false
+      config.setup(conf)
+
+      eq("src", render_folder_name(config.get_config(), "src"))
+    end)
+
+    it("defaults to true", function()
+      eq(true, config.get_config().file_panel.tree_options.folder_trailing_slash)
+    end)
+  end)
+
   -- -----------------------------------------------------------------------
   -- Loading indicator (commit 5f1603a)
   -- -----------------------------------------------------------------------