ci: formatting
This commit is contained in:
parent
13c0ea1e92
commit
e5d9b4b7bd
9 changed files with 44 additions and 18 deletions
|
|
@ -522,11 +522,12 @@ function M.highlight_hunk(bufnr, ns, hunk, opts)
|
|||
char_hl,
|
||||
line:sub(span.col_start + 1, span.col_end)
|
||||
)
|
||||
local ok, err = pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, buf_line, span.col_start + qw, {
|
||||
end_col = span.col_end + qw,
|
||||
hl_group = char_hl,
|
||||
priority = p.char_bg,
|
||||
})
|
||||
local ok, err =
|
||||
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, buf_line, span.col_start + qw, {
|
||||
end_col = span.col_end + qw,
|
||||
hl_group = char_hl,
|
||||
priority = p.char_bg,
|
||||
})
|
||||
if not ok then
|
||||
dbg('char extmark FAILED: %s', err)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -789,7 +789,11 @@ local function init()
|
|||
end
|
||||
local cur = hunk_cache[bufnr]
|
||||
if not cur or cur.tick ~= tick then
|
||||
dbg('deferred syntax stale: cur.tick=%s captured=%d', cur and tostring(cur.tick) or 'nil', tick)
|
||||
dbg(
|
||||
'deferred syntax stale: cur.tick=%s captured=%d',
|
||||
cur and tostring(cur.tick) or 'nil',
|
||||
tick
|
||||
)
|
||||
return
|
||||
end
|
||||
local t1 = config.debug and vim.uv.hrtime() or nil
|
||||
|
|
|
|||
|
|
@ -64,7 +64,9 @@ local function get_ft_from_filename(filename, repo_root)
|
|||
if not ft and vim.fn.did_filetype() ~= 0 then
|
||||
dbg('retrying filetype match for %s (clearing did_filetype)', filename)
|
||||
local saved = rawget(vim.fn, 'did_filetype')
|
||||
rawset(vim.fn, 'did_filetype', function() return 0 end)
|
||||
rawset(vim.fn, 'did_filetype', function()
|
||||
return 0
|
||||
end)
|
||||
ft = vim.filetype.match({ filename = filename })
|
||||
rawset(vim.fn, 'did_filetype', saved)
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue