ci: format
This commit is contained in:
parent
d2921c6fdd
commit
91a856443f
2 changed files with 33 additions and 5 deletions
|
|
@ -370,7 +370,17 @@ function M.highlight_hunk(bufnr, ns, hunk, opts)
|
||||||
header_map[i] = hunk.header_start_line - 1 + i
|
header_map[i] = hunk.header_start_line - 1 + i
|
||||||
end
|
end
|
||||||
extmark_count = extmark_count
|
extmark_count = extmark_count
|
||||||
+ highlight_treesitter(bufnr, ns, hunk.header_lines, 'diff', header_map, qw, nil, p, qw > 0 or pw > 1)
|
+ highlight_treesitter(
|
||||||
|
bufnr,
|
||||||
|
ns,
|
||||||
|
hunk.header_lines,
|
||||||
|
'diff',
|
||||||
|
header_map,
|
||||||
|
qw,
|
||||||
|
nil,
|
||||||
|
p,
|
||||||
|
qw > 0 or pw > 1
|
||||||
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
local at_raw_line
|
local at_raw_line
|
||||||
|
|
|
||||||
|
|
@ -1669,7 +1669,13 @@ describe('highlight', function()
|
||||||
local high_prio_diff = {}
|
local high_prio_diff = {}
|
||||||
for _, mark in ipairs(extmarks) do
|
for _, mark in ipairs(extmarks) do
|
||||||
local d = mark[4]
|
local d = mark[4]
|
||||||
if mark[2] < 4 and d and d.hl_group and d.hl_group:match('^@.*%.diff$') and (d.priority or 0) >= 199 then
|
if
|
||||||
|
mark[2] < 4
|
||||||
|
and d
|
||||||
|
and d.hl_group
|
||||||
|
and d.hl_group:match('^@.*%.diff$')
|
||||||
|
and (d.priority or 0) >= 199
|
||||||
|
then
|
||||||
high_prio_diff[mark[2]] = true
|
high_prio_diff[mark[2]] = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -1727,8 +1733,14 @@ describe('highlight', function()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
assert.is_true(minus_prio > punct_prio_minus, '@diff.minus.diff should beat @punctuation.special.diff on --- line')
|
assert.is_true(
|
||||||
assert.is_true(plus_prio > punct_prio_plus, '@diff.plus.diff should beat @punctuation.special.diff on +++ line')
|
minus_prio > punct_prio_minus,
|
||||||
|
'@diff.minus.diff should beat @punctuation.special.diff on --- line'
|
||||||
|
)
|
||||||
|
assert.is_true(
|
||||||
|
plus_prio > punct_prio_plus,
|
||||||
|
'@diff.plus.diff should beat @punctuation.special.diff on +++ line'
|
||||||
|
)
|
||||||
delete_buffer(bufnr)
|
delete_buffer(bufnr)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
@ -1764,7 +1776,13 @@ describe('highlight', function()
|
||||||
local has_keyword = false
|
local has_keyword = false
|
||||||
for _, mark in ipairs(extmarks) do
|
for _, mark in ipairs(extmarks) do
|
||||||
local d = mark[4]
|
local d = mark[4]
|
||||||
if mark[2] == 1 and d and d.hl_group == '@keyword.diff' and mark[3] == 0 and (d.end_col or 0) == 5 then
|
if
|
||||||
|
mark[2] == 1
|
||||||
|
and d
|
||||||
|
and d.hl_group == '@keyword.diff'
|
||||||
|
and mark[3] == 0
|
||||||
|
and (d.end_col or 0) == 5
|
||||||
|
then
|
||||||
has_keyword = true
|
has_keyword = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue