barrett/diffs.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(vim): syntax highlighting

Browse source
This commit is contained in:
Barrett Ruth 2026-02-02 15:42:15 -05:00
parent a082b9c4b3
commit 548c5386ab
1 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

40
lua/fugitive-ts/highlight.lua
View file

@ -217,10 +217,6 @@ function M.highlight_hunk(bufnr, ns, hunk, opts)
local use_ts = hunk.lang and opts.treesitter.enabled local use_ts = hunk.lang and opts.treesitter.enabled
local use_vim = not use_ts and hunk.ft and opts.vim.enabled local use_vim = not use_ts and hunk.ft and opts.vim.enabled
if not use_ts and not use_vim and not hunk.ft then
return
end
local max_lines = use_ts and opts.treesitter.max_lines or opts.vim.max_lines local max_lines = use_ts and opts.treesitter.max_lines or opts.vim.max_lines
if (use_ts or use_vim) and #hunk.lines > max_lines then if (use_ts or use_vim) and #hunk.lines > max_lines then
dbg( dbg(
@ -236,6 +232,23 @@ function M.highlight_hunk(bufnr, ns, hunk, opts)
local apply_syntax = use_ts or use_vim local apply_syntax = use_ts or use_vim
---@type string[]
local code_lines = {}
if apply_syntax then
for _, line in ipairs(hunk.lines) do
table.insert(code_lines, line:sub(2))
end
end
local extmark_count = 0
if use_ts then
extmark_count = highlight_treesitter(bufnr, ns, hunk, code_lines)
elseif use_vim then
extmark_count = highlight_vim_syntax(bufnr, ns, hunk, code_lines)
end
local syntax_applied = extmark_count > 0
for i, line in ipairs(hunk.lines) do for i, line in ipairs(hunk.lines) do
local buf_line = hunk.start_line + i - 1 local buf_line = hunk.start_line + i - 1
local line_len = #line local line_len = #line
@ -266,7 +279,7 @@ function M.highlight_hunk(bufnr, ns, hunk, opts)
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, buf_line, 0, extmark_opts) pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, buf_line, 0, extmark_opts)
end end
if line_len > 1 and apply_syntax then if line_len > 1 and syntax_applied then
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, buf_line, 1, { pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, buf_line, 1, {
end_col = line_len, end_col = line_len,
hl_group = 'Normal', hl_group = 'Normal',
@ -275,23 +288,6 @@ function M.highlight_hunk(bufnr, ns, hunk, opts)
end end
end end
if not apply_syntax then
return
end
---@type string[]
local code_lines = {}
for _, line in ipairs(hunk.lines) do
table.insert(code_lines, line:sub(2))
end
local extmark_count = 0
if use_ts then
extmark_count = highlight_treesitter(bufnr, ns, hunk, code_lines)
elseif use_vim then
extmark_count = highlight_vim_syntax(bufnr, ns, hunk, code_lines)
end
dbg('hunk %s:%d applied %d extmarks', hunk.filename, hunk.start_line, extmark_count) dbg('hunk %s:%d applied %d extmarks', hunk.filename, hunk.start_line, extmark_count)
end end