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

fix(ci): typing

Browse source
This commit is contained in:
Barrett Ruth 2026-02-06 21:33:55 -05:00
parent 5722ccdbb2
commit b79adba5f2
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lua/diffs/diff.lua
View file

@ -11,6 +11,10 @@
---@field del_lines {idx: integer, text: string}[] ---@field del_lines {idx: integer, text: string}[]
---@field add_lines {idx: integer, text: string}[] ---@field add_lines {idx: integer, text: string}[]
---@class diffs.DiffOpts
---@field algorithm? string
---@field linematch? integer
local M = {} local M = {}
local dbg = require('diffs.log').dbg local dbg = require('diffs.log').dbg
@ -60,7 +64,7 @@ function M.extract_change_groups(hunk_lines)
return groups return groups
end end
---@return {algorithm?: string, linematch?: integer} ---@return diffs.DiffOpts
local function parse_diffopt() local function parse_diffopt()
local opts = {} local opts = {}
for _, item in ipairs(vim.split(vim.o.diffopt, ',')) do for _, item in ipairs(vim.split(vim.o.diffopt, ',')) do
@ -76,7 +80,7 @@ end
---@param old_text string ---@param old_text string
---@param new_text string ---@param new_text string
---@param diff_opts? {algorithm?: string, linematch?: integer} ---@param diff_opts? diffs.DiffOpts
---@return {old_start: integer, old_count: integer, new_start: integer, new_count: integer}[] ---@return {old_start: integer, old_count: integer, new_start: integer, new_count: integer}[]
local function byte_diff(old_text, new_text, diff_opts) local function byte_diff(old_text, new_text, diff_opts)
local vim_opts = { result_type = 'indices' } local vim_opts = { result_type = 'indices' }
@ -119,7 +123,7 @@ end
---@param new_line string ---@param new_line string
---@param del_idx integer ---@param del_idx integer
---@param add_idx integer ---@param add_idx integer
---@param diff_opts? {algorithm?: string, linematch?: integer} ---@param diff_opts? diffs.DiffOpts
---@return diffs.CharSpan[], diffs.CharSpan[] ---@return diffs.CharSpan[], diffs.CharSpan[]
local function char_diff_pair(old_line, new_line, del_idx, add_idx, diff_opts) local function char_diff_pair(old_line, new_line, del_idx, add_idx, diff_opts)
---@type diffs.CharSpan[] ---@type diffs.CharSpan[]
@ -157,7 +161,7 @@ local function char_diff_pair(old_line, new_line, del_idx, add_idx, diff_opts)
end end
---@param group diffs.ChangeGroup ---@param group diffs.ChangeGroup
---@param diff_opts? {algorithm?: string, linematch?: integer} ---@param diff_opts? diffs.DiffOpts
---@return diffs.CharSpan[], diffs.CharSpan[] ---@return diffs.CharSpan[], diffs.CharSpan[]
local function diff_group_native(group, diff_opts) local function diff_group_native(group, diff_opts)
---@type diffs.CharSpan[] ---@type diffs.CharSpan[]
@ -334,7 +338,7 @@ function M.compute_intra_hunks(hunk_lines, algorithm)
end end
end end
---@type {algorithm?: string, linematch?: integer}? ---@type diffs.DiffOpts?
local diff_opts = nil local diff_opts = nil
if not vscode_handle then if not vscode_handle then
diff_opts = parse_diffopt() diff_opts = parse_diffopt()