fix(vcs): add darker diff colors

Improve readability in diff views
thesimonho · Sep 20, 2024 · 928f0f4 · 928f0f4
1 parent cb5b597
commit 928f0f4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/lua/kanagawa-paper/highlights/editor.lua b/lua/kanagawa-paper/highlights/editor.lua
@@ -27,13 +27,13 @@ function M.setup(colors, opts)
 		-- Directory	Directory names (and other special names in listings).
 		Directory = { fg = theme.syn.fun },
 		-- DiffAdd		Diff mode: Added line. |diff.txt|
-		DiffAdd = { bg = theme.diff.add },
+		DiffAdd = { bg = theme.diff.addDark },
 		-- DiffChange	Diff mode: Changed line. |diff.txt|
-		DiffChange = { bg = theme.diff.change },
+		DiffChange = { bg = theme.diff.changeDark },
 		-- DiffDelete	Diff mode: Deleted line. |diff.txt|
-		DiffDelete = { fg = theme.vcs.removed, bg = theme.diff.delete },
+		DiffDelete = { fg = theme.vcs.removed, bg = theme.diff.deleteDark },
 		-- DiffText	Diff mode: Changed text within a changed line. |diff.txt|
-		DiffText = { bg = theme.diff.text },
+		DiffText = { bg = theme.diff.textDark, fg = theme.ui.fg, bold = true },
 		-- EndOfBuffer	Filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|.
 		EndOfBuffer = { fg = theme.ui.bg },
 		-- TermCursor	Cursor in a focused terminal.

diff --git a/lua/kanagawa-paper/highlights/plugins.lua b/lua/kanagawa-paper/highlights/plugins.lua
@@ -40,6 +40,9 @@ function M.setup(colors, opts)
 		OctoStateOpen = { link = "DiagnosticVirtualTextHint" },
 		OctoStatePending = { link = "DiagnosticVirtualTextWarn" },
 		OctoStatusColumn = { fg = theme.syn.number },
+		OctoPullAdditions = { bg = theme.diff.addDark },
+		OctoPullDeletions = { bg = theme.diff.deleteDark },
+		OctoPullModifications = { bg = theme.diff.changeDark },
 
 		-- TreeSitter Extensions
 		TreesitterContext = { link = "Folded" },

diff --git a/lua/kanagawa-paper/themes.lua b/lua/kanagawa-paper/themes.lua
@@ -33,11 +33,18 @@
 ---@field delete ColorSpec
 ---@field change ColorSpec
 ---@field text ColorSpec
+---@field addDark ColorSpec
+---@field deleteDark ColorSpec
+---@field changeDark ColorSpec
+---@field textDark ColorSpec
 
 ---@class VCSElements
 ---@field added ColorSpec
 ---@field removed ColorSpec
 ---@field changed ColorSpec
+---@field addedDark ColorSpec
+---@field removedDark ColorSpec
+---@field changedDark ColorSpec
 
 ---@class ModeElements
 ---@field normal ColorSpec
@@ -193,14 +200,21 @@ return function(palette)
 		},
 		vcs = {
 			added = palette.autumnGreen,
+			addedDark = palette.winterGreen,
 			removed = palette.autumnRed,
+			removedDark = palette.winterRed,
 			changed = palette.autumnYellow,
+			changedDark = palette.winterYellow,
 		},
 		diff = {
 			add = palette.autumnGreen,
+			addDark = palette.winterGreen,
 			delete = palette.autumnRed,
+			deleteDark = palette.winterRed,
 			change = palette.autumnYellow,
+			changeDark = palette.winterYellow,
 			text = palette.dragonBlue,
+			textDark = palette.winterBlue,
 		},
 		diag = {
 			error = palette.samuraiRed,