mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-24 17:58:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

plugins/nvim-tree: remove deprecated option view.mappings

Browse source
This commit is contained in:
Gaetan Lepage 2023-04-24 09:08:50 +02:00 • committed by Gaétan Lepage
parent e7f2da50e2
commit 67ef20a223
2 changed files with 51 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

89
plugins/filetrees/nvim-tree.nix
View file

@ -48,6 +48,20 @@ in {
(optionWarnings.mkDeprecatedOption { (optionWarnings.mkDeprecatedOption {
option = basePluginPath ++ ["removeKeymaps"]; option = basePluginPath ++ ["removeKeymaps"];
alternative = basePluginPath ++ ["onAttach"]; alternative = basePluginPath ++ ["onAttach"];
message = ''
Mappings can now be customized from the `onAttach` function.
Learn more at `:help nvim-tree-mappings-legacy`.
'';
})
# Deprecate warning added 2023-04-24
# TODO Remove both this warning and the one above (removeKeymaps) in ~1 month (June).
(optionWarnings.mkDeprecatedOption {
option = basePluginPath ++ ["view" "mappings"];
alternative = basePluginPath ++ ["onAttach"];
message = ''
Mappings can now be customized from the `onAttach` function.
Learn more at `:help nvim-tree-mappings-legacy`.
'';
}) })
]; ];
@ -373,7 +387,7 @@ in {
Necessary when using a UI prompt decorator such as dressing.nvim or telescope-ui-select.nvim. Necessary when using a UI prompt decorator such as dressing.nvim or telescope-ui-select.nvim.
''; '';
view = helpers.mkCompositeOption "Window / buffer setup." { view = {
centralizeSelection = helpers.defaultNullOpts.mkBool false '' centralizeSelection = helpers.defaultNullOpts.mkBool false ''
When entering nvim-tree, reposition the view so that the current node is When entering nvim-tree, reposition the view so that the current node is
initially centralized, see |zz|. initially centralized, see |zz|.
@ -1036,43 +1050,42 @@ in {
on_attach = onAttach; on_attach = onAttach;
remove_keymaps = removeKeymaps; remove_keymaps = removeKeymaps;
select_prompts = selectPrompts; select_prompts = selectPrompts;
view = with view; view = with view; {
ifNonNull' cfg.view { centralize_selection = centralizeSelection;
centralize_selection = centralizeSelection; inherit cursorline;
inherit cursorline; debounce_delay = debounceDelay;
debounce_delay = debounceDelay; hide_root_folder = hideRootFolder;
hide_root_folder = hideRootFolder; inherit width;
inherit width; inherit side;
inherit side; preserve_window_proportions = preserveWindowProportions;
preserve_window_proportions = preserveWindowProportions; inherit number;
inherit number; inherit relativenumber;
inherit relativenumber; inherit signcolumn;
inherit signcolumn; mappings = with mappings;
mappings = with mappings; ifNonNull' cfg.view.mappings {
ifNonNull' cfg.view.mappings { custom_only = customOnly;
custom_only = customOnly; list =
list = if list == null
if list == null then null
then null else
else map (
map ( mapping: {
mapping: { inherit (mapping) key action mode;
inherit (mapping) key action mode; action_cb =
action_cb = if (mapping.action_cb == null)
if (mapping.action_cb == null) then null
then null else helpers.mkRaw mapping.action_cb;
else helpers.mkRaw mapping.action_cb; }
} )
) list;
list; };
}; float = with float;
float = with float; ifNonNull' cfg.view.float {
ifNonNull' cfg.view.float { inherit enable;
inherit enable; quit_on_focus_loss = quitOnFocusLoss;
quit_on_focus_loss = quitOnFocusLoss; open_win_config = openWinConfig;
open_win_config = openWinConfig; };
}; };
};
renderer = with renderer; renderer = with renderer;
ifNonNull' cfg.renderer { ifNonNull' cfg.renderer {
add_trailing = addTrailing; add_trailing = addTrailing;

28
tests/test-sources/plugins/filetrees/nvim-tree.nix
View file

@ -90,34 +90,6 @@
number = false; number = false;
relativenumber = false; relativenumber = false;
signcolumn = "yes"; signcolumn = "yes";
mappings = {
customOnly = false;
list = [
# remove a default mapping for cd
{
key = "<2-RightMouse>";
action = "";
}
# add multiple normal mode mappings for edit
{
key = ["<CR>" "o"];
action = "edit";
mode = "n";
}
# custom action
{
key = "p";
action = "print_the_node_path";
action_cb = ''
function(node)
print(node.absolute_path)
end
'';
}
];
};
float = { float = {
enable = false; enable = false;
quitOnFocusLoss = true; quitOnFocusLoss = true;