diff options
| author | Lewis Russell <lewis6991@gmail.com> | 2024-09-29 11:20:18 +0100 |
|---|---|---|
| committer | Lewis Russell <lewis6991@gmail.com> | 2024-09-30 11:51:33 +0100 |
| commit | 0fb5299e53cc0d7a5c03c333b1ed79262a0db3f9 (patch) | |
| tree | 0301447a10df4021c0157e5e96738f4a6adbcc0d /runtime | |
| parent | c65646c2474d22948c604168a68f6626a645d1d2 (diff) | |
| download | rneovim-0fb5299e53cc0d7a5c03c333b1ed79262a0db3f9.tar.gz rneovim-0fb5299e53cc0d7a5c03c333b1ed79262a0db3f9.tar.bz2 rneovim-0fb5299e53cc0d7a5c03c333b1ed79262a0db3f9.zip | |
test: refactor exec_lua in xdiff_spec
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/lua.txt | 2 | ||||
| -rw-r--r-- | runtime/lua/vim/_meta/diff.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt index cbe283065d..e793a97fe1 100644 --- a/runtime/doc/lua.txt +++ b/runtime/doc/lua.txt @@ -715,7 +715,7 @@ vim.diff({a}, {b}, {opts}) *vim.diff()* • {b} (`string`) Second string to compare • {opts} (`table?`) Optional parameters: • {on_hunk}? - (`fun(start_a: integer, count_a: integer, start_b: integer, count_b: integer): integer`) + (`fun(start_a: integer, count_a: integer, start_b: integer, count_b: integer): integer?`) Invoked for each hunk in the diff. Return a negative number to cancel the callback for any remaining hunks. Arguments: • `start_a` (`integer`): Start line of hunk in {a}. diff --git a/runtime/lua/vim/_meta/diff.lua b/runtime/lua/vim/_meta/diff.lua index 5a0de68119..4803ed4775 100644 --- a/runtime/lua/vim/_meta/diff.lua +++ b/runtime/lua/vim/_meta/diff.lua @@ -11,7 +11,7 @@ --- - `count_a` (`integer`): Hunk size in {a}. --- - `start_b` (`integer`): Start line of hunk in {b}. --- - `count_b` (`integer`): Hunk size in {b}. ---- @field on_hunk? fun(start_a: integer, count_a: integer, start_b: integer, count_b: integer): integer +--- @field on_hunk? fun(start_a: integer, count_a: integer, start_b: integer, count_b: integer): integer? --- --- Form of the returned diff: --- - `unified`: String in unified format. |