feat(commit): styling improvements for message input

Author: chrisgrieser

lua/tinygit/commands/commit/msg-input.lua

@@ -136,13 +136,12 @@ local function setupSeparator(width)
 	local function updateSeparator()
 		local ns = vim.api.nvim_create_namespace("tinygit.commitMsgInput")
 		vim.api.nvim_buf_clear_namespace(state.bufnr, ns, 0, -1)
-		local separator = { char = "┄", hlgroup = "Comment" }
+		local separator = { char = "┄", hlgroup = "NonText" }
 
 		vim.api.nvim_buf_set_extmark(state.bufnr, ns, 0, 0, {
 			virt_lines = {
-				{ { separator.char:rep(width), separator.hlgroup } },
+				{ { separator.char:rep(width - 2), separator.hlgroup } },
 			},
-			virt_lines_leftcol = true,
 		})
 	end
 	updateSeparator() -- initialize
@@ -206,14 +205,14 @@ function M.new(mode, prompt, confirmationCallback)
 	local keymapHints = {}
 	if conf.keymapHints then
 		local nmaps = conf.keymaps.normal
-		local hlgroup = { key = "Comment", desc = "NonText" }
+		local hlgroupKey, hlgroupDesc = "Comment", "NonText"
 		keymapHints = {
 			{ " normal: ", "FloatBorder" },
-			{ " " .. nmaps.confirm, hlgroup.key },
-			{ " confirm ", hlgroup.desc },
+			{ " " .. nmaps.confirm, hlgroupKey },
+			{ " confirm ", hlgroupDesc },
 			{ " " },
-			{ " " .. nmaps.abort, hlgroup.key },
-			{ " abort ", hlgroup.desc },
+			{ " " .. nmaps.abort, hlgroupKey },
+			{ " abort ", hlgroupDesc },
 			{ " " },
 		}
 	end

lua/tinygit/commands/commit/preview.lua

@@ -94,9 +94,12 @@ local function highlightPreviewWin(bufnr, stagedLines, diffstatLines)
 		vim.fn.matchadd(hl[1], pattern)
 	end
 
-	-- highlight diffstat for UNSTAGED lines
+	-- highlight diffstat for UNSTAGED lines (if any)
 	local ns = vim.api.nvim_create_namespace("tinygit.commitPreview")
-	vim.hl.range(bufnr, ns, "Comment", { stagedLines, 0 }, { diffstatLines, 0 }, { priority = 1000 })
+	vim.hl.range(bufnr, ns, "Comment", { stagedLines, 0 }, { diffstatLines - 1, -1 })
+
+	-- highlight separator line
+	vim.hl.range(bufnr, ns, "NonText", { diffstatLines, 0 }, { diffstatLines, -1 })
 
 	-- highlight log lines
 	local highlights = require("tinygit.shared.highlights")
@@ -114,7 +117,7 @@ function M.createWin(mode, inputWinid)
 	local textWidth = inputWin.width - 2
 	local diffStatLines, summary, stagedLinesCount = M.getDiffStats(mode, textWidth)
 	local diffstatLineCount = #diffStatLines -- save, since `list_extend` mutates
-	table.insert(diffStatLines, "") -- line break
+	table.insert(diffStatLines, ("─"):rep(textWidth)) -- separator
 	local logLines = M.getGitLog()
 	local previewLines = vim.list_extend(diffStatLines, logLines)
 
@@ -142,7 +145,7 @@ function M.createWin(mode, inputWinid)
 	vim.bo[bufnr].filetype = "tinygit.diffstats"
 	vim.wo[winid].statuscolumn = " " -- = left-padding
 
-	vim.wo[winid].winhighlight = "FloatFooter:NonText,FloatBorder:Comment,Normal:Normal"
+	vim.wo[winid].winhighlight = "FloatFooter:Comment,FloatBorder:Comment,Normal:Normal"
 	vim.api.nvim_win_call(
 		winid,
 		function() highlightPreviewWin(bufnr, stagedLinesCount, diffstatLineCount) end