Skip to content

tests: use __empty and __raw #3865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 5, 2025
Merged

tests: use __empty and __raw #3865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02b73ed
tests: use `__empty` and `__raw`
saygo-png Oct 27, 2025
a3afddc
plugins/emmet: use `nestedLiteralLua`
saygo-png Oct 27, 2025
0a408f0
plugins/lazygit: use `nestedLiteralLua`
saygo-png Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions plugins/by-name/emmet/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}:
let
inherit (lib) types;
inherit (lib.nixvim) defaultNullOpts mkNullOrOption;
inherit (lib.nixvim) defaultNullOpts mkNullOrOption nestedLiteralLua;
in
lib.nixvim.plugins.mkVimPlugin {
name = "emmet";
Expand Down Expand Up @@ -49,11 +49,11 @@ lib.nixvim.plugins.mkVimPlugin {
html = {
default_attributes = {
option = {
value = null;
value = nestedLiteralLua "nil";
};
textarea = {
id = null;
name = null;
id = nestedLiteralLua "nil";
name = nestedLiteralLua "nil";
cols = 10;
rows = 10;
};
Expand Down
4 changes: 2 additions & 2 deletions plugins/by-name/lazygit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}:
let
inherit (lib) types;
inherit (lib.nixvim) defaultNullOpts;
inherit (lib.nixvim) defaultNullOpts nestedLiteral;
in
lib.nixvim.plugins.mkVimPlugin {
name = "lazygit";
Expand Down Expand Up @@ -89,6 +89,6 @@ lib.nixvim.plugins.mkVimPlugin {
floating_window_use_plenary = 0;
use_neovim_remote = 1;
use_custom_config_file_path = 0;
config_file_path = [ ];
config_file_path = nestedLiteral "lib.nixvim.emptyTable";
};
}
4 changes: 2 additions & 2 deletions tests/test-sources/plugins/by-name/actions-preview/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
diff = {
ctxlen = 3;
};
highlight_command = [ ];
highlight_command.__empty = { };
backend = [
"telescope"
"minipick"
Expand All @@ -35,7 +35,7 @@
'';
nui = {
dir = "col";
keymap = null;
keymap.__raw = "nil";
layout = {
position = "50%";
size = {
Expand Down
14 changes: 7 additions & 7 deletions tests/test-sources/plugins/by-name/aerial/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
40
0.2
];
width = null;
width.__raw = "nil";
min_width = 10;
win_opts = { };
win_opts.__empty = { };
default_direction = "prefer_right";
placement = "window";
resize_to_content = true;
preserve_equality = false;
};
attach_mode = "window";
close_automatic_events = [ ];
close_automatic_events.__empty = { };
keymaps = {
"?" = "actions.show_help";
"g?" = "actions.show_help";
Expand Down Expand Up @@ -82,11 +82,11 @@
highlight_on_hover = false;
highlight_on_jump = 300;
autojump = false;
icons = [ ];
icons.__empty = { };
ignore = {
unlisted_buffers = false;
diff_windows = true;
filetypes = [ ];
filetypes.__empty = { };
buftypes = "special";
wintypes = "special";
};
Expand Down Expand Up @@ -126,7 +126,7 @@
border = "rounded";
relative = "cursor";
max_height = 0.9;
height = null;
height.__raw = "nil";
min_height = [
8
0.1
Expand Down Expand Up @@ -171,7 +171,7 @@
diagnostics_trigger_update = false;
update_when_errors = true;
update_delay = 300;
priority = { };
priority.__empty = { };
};
treesitter = {
update_delay = 300;
Expand Down
2 changes: 1 addition & 1 deletion tests/test-sources/plugins/by-name/aider/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
default_bindings = false;
debug = true;
vim = true;
ignore_buffers = [ ];
ignore_buffers.__empty = { };
border = {
style = [
"╭"
Expand Down
6 changes: 3 additions & 3 deletions tests/test-sources/plugins/by-name/airline/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
inactive_collapse = 1;
inactive_alt_sep = 1;
theme = "dark";
theme_patch_func = null;
theme_patch_func.__raw = "nil";
powerline_fonts = 0;
symbols_ascii = 0;
mode_map = {
Expand All @@ -47,8 +47,8 @@
v = "V";
V = "V";
};
exclude_filenames = [ ];
exclude_filetypes = [ ];
exclude_filenames.__empty = { };
exclude_filetypes.__empty = { };
filetype_overrides = {
coc-explorer = [
"CoC Explorer"
Expand Down
2 changes: 1 addition & 1 deletion tests/test-sources/plugins/by-name/auto-save/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
];
cancel_deferred_save = [ "InsertEnter" ];
};
condition = null;
condition.__raw = "nil";
write_all_buffers = false;
noautocmd = false;
lockmarks = false;
Expand Down
8 changes: 4 additions & 4 deletions tests/test-sources/plugins/by-name/auto-session/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
auto_save = true;
auto_restore = true;
auto_create = true;
suppressed_dirs = null;
allowed_dirs = null;
suppressed_dirs.__raw = "nil";
allowed_dirs.__raw = "nil";
auto_restore_last_session = false;
use_git_branch = false;
lazy_support = true;
bypass_save_filetypes = null;
bypass_save_filetypes.__raw = "nil";
close_unsupported_windows = true;
args_allow_single_directory = true;
args_allow_files_auto_save = false;
Expand All @@ -27,7 +27,7 @@
log_level = "error";
session_lens = {
load_on_setup = true;
theme_conf = { };
theme_conf.__empty = { };
previewer = false;
mappings = {
delete_session = {
Expand Down
2 changes: 1 addition & 1 deletion tests/test-sources/plugins/by-name/avante/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
copilot = {
endpoint = "https://api.githubcopilot.com";
model = "gpt-4o-2024-05-13";
proxy = null;
proxy.__raw = "nil";
allow_insecure = false;
timeout = 30000;
extra_request_body = {
Expand Down
18 changes: 9 additions & 9 deletions tests/test-sources/plugins/by-name/barbar/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
animation = true;
auto_hide = -1;
clickable = true;
exclude_ft = [ ];
exclude_name = [ ];
exclude_ft.__empty = { };
exclude_name.__empty = { };
focus_on_close = "left";
hide = {
alternate = false;
Expand Down Expand Up @@ -94,10 +94,10 @@
filename = false;
separator.right = " ";
};
alternate = { };
current = { };
inactive = { };
visible = { };
alternate.__empty = { };
current.__empty = { };
inactive.__empty = { };
visible.__empty = { };
preset = "default";
};
insert_at_start = false;
Expand All @@ -107,9 +107,9 @@
maximum_length = 30;
minimum_length = 0;
minimum_padding = 1;
no_name_title = null;
no_name_title.__raw = "nil";
semantic_letters = true;
sidebar_filetypes = { };
sidebar_filetypes.__empty = { };
tabpages = true;
};
};
Expand Down Expand Up @@ -219,7 +219,7 @@
};
};
letters = "asdfjkl;ghnmxcvbziowerutyqpASDFJKLGHNMXCVBZIOWERUTYQP";
no_name_title = null;
no_name_title.__raw = "nil";
};
};
};
Expand Down
4 changes: 2 additions & 2 deletions tests/test-sources/plugins/by-name/blame/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
focus_blame = true;
merge_consecutive = false;
max_summary_width = 30;
colors = null; # won't output literal nil
blame_options = null; # won't output literal nil
colors.__raw = "nil";
blame_options.__raw = "nil";
format_fn.__raw = "require('blame.formats.default_formats').commit_date_author_fn";
commit_detail_view = "vsplit";
mappings = {
Expand Down
22 changes: 12 additions & 10 deletions tests/test-sources/plugins/by-name/blink-cmp/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
"("
")"
];
override_brackets_for_filetypes = { };
force_allow_filetypes = [ ];
blocked_filetypes = [ ];
override_brackets_for_filetypes.__empty = { };
force_allow_filetypes.__empty = { };
blocked_filetypes.__empty = { };
kind_resolution = {
enabled = true;
blocked_filetypes = [
Expand Down Expand Up @@ -112,7 +112,7 @@
align_to = "label";
padding = 1;
gap = 1;
treesitter = { };
treesitter.__empty = { };
columns = [
[ "kind_icon" ]
{
Expand Down Expand Up @@ -232,9 +232,9 @@
prebuilt_binaries = {
download = true;
ignore_version_mismatch = false;
force_version = null;
force_system_triple = null;
extra_curl_args = [ ];
force_version.__raw = "nil";
force_system_triple.__raw = "nil";
extra_curl_args.__empty = { };
};
};
sources = {
Expand All @@ -244,7 +244,7 @@
"snippets"
"buffer"
];
per_filetype = { };
per_filetype.__empty = { };
cmdline.__raw = ''
function()
local type = vim.fn.getcmdtype()
Expand Down Expand Up @@ -310,8 +310,8 @@
enabled = false;
trigger = {
enabled = true;
blocked_trigger_characters = [ ];
blocked_retrigger_characters = [ ];
blocked_trigger_characters.__empty = { };
blocked_retrigger_characters.__empty = { };
show_on_insert_on_trigger_character = true;
};
window = {
Expand Down Expand Up @@ -387,6 +387,8 @@
'';
};
};

# FIXME: This should be __empty but this config is out of date so it throws
cmdline = [ ];
};
completion = {
Expand Down
18 changes: 9 additions & 9 deletions tests/test-sources/plugins/by-name/bufferline/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,22 @@
close_command = "bdelete! %d";
left_mouse_command = "buffer %d";
right_mouse_command = "bdelete! %d";
middle_mouse_command = null;
middle_mouse_command.__raw = "nil";
indicator = {
icon = "▎";
style = "icon";
};
left_trunc_marker = "";
right_trunc_marker = "";
separator_style = "thin";
name_formatter = null;
name_formatter.__raw = "nil";
truncate_names = true;
tab_size = 18;
max_name_length = 18;
color_icons = true;
show_buffer_icons = true;
show_buffer_close_icons = true;
get_element_icon = null;
get_element_icon.__raw = "nil";
show_close_icon = true;
show_tab_indicators = true;
show_duplicate_prefix = true;
Expand All @@ -102,27 +102,27 @@
max_prefix_length = 15;
sort_by = "id";
diagnostics = false;
diagnostics_indicator = null;
diagnostics_indicator.__raw = "nil";
diagnostics_update_in_insert = true;
diagnostics_update_on_event = true;
offsets = null;
offsets.__raw = "nil";
groups = {
items = [ ];
items.__empty = { };
options = {
toggle_hidden_on_enter = true;
};
};
hover = {
enabled = false;
reveal = [ ];
reveal.__empty = { };
delay = 200;
};
debug = {
logging = false;
};
custom_filter = null;
custom_filter.__raw = "nil";
};
highlights = { };
highlights.__empty = { };
};
};
};
Expand Down
4 changes: 2 additions & 2 deletions tests/test-sources/plugins/by-name/ccc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
lsp = true;
highlighter = {
auto_enable = false;
filetypes = [ ];
excludes = [ ];
filetypes.__empty = { };
excludes.__empty = { };
lsp = true;
update_insert = true;
};
Expand Down
4 changes: 2 additions & 2 deletions tests/test-sources/plugins/by-name/chadtree/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
"thumbs.db"
".git"
];
name_glob = [ ];
path_glob = [ ];
name_glob.__empty = { };
path_glob.__empty = { };
};
view = {
open_direction = "left";
Expand Down
Loading