From 0d95fc68881e8608222d2ec6bca9c27ba6c29114 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 10 Jul 2024 10:21:37 +0200 Subject: [PATCH] plugins/telescope/extensions/undo: deprecate option diff_context_lines --- plugins/telescope/extensions/undo.nix | 10 ++++++---- tests/test-sources/plugins/telescope/undo.nix | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/telescope/extensions/undo.nix b/plugins/telescope/extensions/undo.nix index dafe139a..c36e0b38 100644 --- a/plugins/telescope/extensions/undo.nix +++ b/plugins/telescope/extensions/undo.nix @@ -77,9 +77,11 @@ telescopeHelpers.mkExtension { the side-by-side view even if this is set to false. ''; - diff_context_lines = helpers.defaultNullOpts.mkStrLuaOr types.ints.unsigned "vim.o.scrolloff" '' - Defaults to the scrolloff. - ''; + vim_diff_opts = { + ctxlen = helpers.defaultNullOpts.mkStrLuaOr types.ints.unsigned "vim.o.scrolloff" '' + Defaults to the scrolloff. + ''; + }; entry_format = helpers.defaultNullOpts.mkStr "state #$ID, $STAT, $TIME" '' The format to show on telescope for the different versions of the file. @@ -116,7 +118,7 @@ telescopeHelpers.mkExtension { "echo '$DIFF' | delta" ]; side_by_side = true; - diff_context_lines = 8; + vim_diff_opts.ctxlen = 8; entry_format = "state #$ID"; time_format = "!%Y-%m-%dT%TZ"; mappings = { diff --git a/tests/test-sources/plugins/telescope/undo.nix b/tests/test-sources/plugins/telescope/undo.nix index cf89fe88..10b20c2c 100644 --- a/tests/test-sources/plugins/telescope/undo.nix +++ b/tests/test-sources/plugins/telescope/undo.nix @@ -21,7 +21,7 @@ "echo '$DIFF' | delta" ]; side_by_side = true; - diff_context_lines = 8; + vim_diff_opts.ctxlen = 8; entry_format = "state #$ID"; time_format = "!%Y-%m-%dT%TZ"; mappings = {