Skip to content
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.

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

[main] Update flake.lock & generated files #2991

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions flake/dev/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions generated/efmls-configs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,7 @@
possible = [
"sql-formatter"
"sqlfluff"
"sqruff"
];
};
linter = {
Expand Down
34 changes: 28 additions & 6 deletions generated/lspconfig-servers.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions generated/none-ls.nix
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
"buildifier"
"cbfmt"
"clang_format"
"cljfmt"
"cljstyle"
"cmake_format"
"codespell"
Expand Down
31 changes: 29 additions & 2 deletions generated/rust-analyzer.nix
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,24 @@
kind = "boolean";
};
};
"rust-analyzer.completion.autoAwait.enable" = {
description = ''
Toggles the additional completions that automatically show method calls and field accesses with `await` prefixed to them when completing on a future.
'';
pluginDefault = true;
type = {
kind = "boolean";
};
};
"rust-analyzer.completion.autoIter.enable" = {
description = ''
Toggles the additional completions that automatically show method calls with `iter()` or `into_iter()` prefixed to them when completing on a type that has them.
'';
pluginDefault = true;
type = {
kind = "boolean";
};
};
"rust-analyzer.completion.autoimport.enable" = {
description = ''
Toggles the additional completions that automatically add imports when completed.
Expand Down Expand Up @@ -833,9 +851,9 @@
kind = "list";
};
};
"rust-analyzer.files.excludeDirs" = {
"rust-analyzer.files.exclude" = {
description = ''
These directories will be ignored by rust-analyzer. They are
These paths (file/directories) will be ignored by rust-analyzer. They are
relative to the workspace root, and globs are not supported. You may
also need to add the folders to Code's `files.watcherExclude`.
'';
Expand Down Expand Up @@ -1558,6 +1576,15 @@
kind = "boolean";
};
};
"rust-analyzer.inlayHints.typeHints.hideClosureParameter" = {
description = ''
Whether to hide inlay parameter type hints for closures.
'';
pluginDefault = false;
type = {
kind = "boolean";
};
};
"rust-analyzer.inlayHints.typeHints.hideNamedConstructor" = {
description = ''
Whether to hide inlay type hints for constructors.
Expand Down
3 changes: 2 additions & 1 deletion plugins/by-name/efmls-configs/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,9 @@ in
"shellharden"
"shfmt"
"smlfmt"
"sqlfluff"
"sql-formatter"
"sqlfluff"
"sqruff"
"statix"
"stylua"
"taplo"
Expand Down
126 changes: 64 additions & 62 deletions plugins/by-name/markview/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,78 +21,80 @@ lib.nixvim.plugins.mkNeovimPlugin {
'';

settingsOptions = {
buf_ignore = defaultNullOpts.mkListOf types.str [ "nofile" ] ''
Buftypes to disable markview-nvim.
'';
preview = {
enable = defaultNullOpts.mkBool true ''
Enable preview functionality.
'';

modes =
defaultNullOpts.mkListOf types.str
[
"n"
"no"
]
''
Modes where preview is enabled.
'';
enable_hybrid_mode = defaultNullOpts.mkBool true ''
Enable hybrid mode functionality.
'';

hybrid_modes = defaultNullOpts.mkListOf types.str null ''
Modes where hybrid mode is enabled.
'';
buf_ignore = defaultNullOpts.mkListOf types.str [ "nofile" ] ''
Buftypes to disable markview-nvim.
'';

callback = {
on_enable = defaultNullOpts.mkLuaFn' {
pluginDefault = # Lua
modes =
defaultNullOpts.mkListOf types.str
[
"n"
"no"
"c"
]
''
function(buf, win)
vim.wo[window].conceallevel = 2;
vim.wo[window].concealcursor = "nc";
end
Modes where preview is enabled.
'';
description = ''
Action to perform when markview is enabled.
'';
};

on_disable = defaultNullOpts.mkLuaFn' {
pluginDefault = # Lua
''
function(buf, win)
vim.wo[window].conceallevel = 0;
vim.wo[window].concealcursor = "";
end
'';
description = ''
Action to perform when markview is disabled.
'';
};
hybrid_modes = defaultNullOpts.mkListOf types.str null ''
Modes where hybrid mode is enabled.
'';

on_mode_change = defaultNullOpts.mkLuaFn' {
pluginDefault = # Lua
''
function(buf, win, mode)
if vim.list_contains(markview.configuration.modes, mode) then
vim.wo[window].conceallevel = 2;
else
vim.wo[window].conceallevel = 0;
end
end
'';
description = ''
Action to perform when mode is changed, while the plugin is enabled.
'';
};
icon_provider = defaultNullOpts.mkEnum [ "devicons" "internal" "mini" ] "internal" ''
Provider for icons.
Available options:
- "devicons": Use nvim-web-devicons
- "internal": Use internal icons (default)
- "mini": Use mini.icons
'';
};
};

settingsExample = {
buf_ignore = [ ];
modes = [
"n"
"x"
];
hybrid_modes = [
"i"
"r"
];
Comment on lines -88 to -96
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd be nice if we had a warning when cfg.settings has definitions for these at their old locations.

Not critical, but it could be a useful heads up for our users.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a basic warning that links to upstream's migration guide

preview = {
buf_ignore = [ ];
modes = [
"n"
"x"
];
hybrid_modes = [
"i"
"r"
];
};
};

extraConfig = cfg: {
# v25 migration warning added 2025-03-04
warnings = lib.nixvim.mkWarnings "plugins.markview" (
lib.map
(name: {
when = cfg.settings ? ${name};
message = ''
v25 had a complete spec redesign. `${name}` had been moved to `preview.${
if name == "callback" then "callbacks" else name
}`.
See https://github.com/OXY2DEV/markview.nvim/blob/v25.0.0/doc/migration.txt#L155
'';
})
[
"buf_ignore"
"callback"
"callbacks"
"debounce"
"filetypes"
"hybrid_modes"
"modes"
]
);
};
}
1 change: 1 addition & 0 deletions plugins/by-name/none-ls/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ in
"checkmake"
"checkstyle"
"clazy"
"cljfmt"
"codespell"
"commitlint"
"cppcheck"
Expand Down
5 changes: 5 additions & 0 deletions plugins/lsp/language-servers/pylsp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,11 @@ in
# Those tests fail when third-party plugins are loaded
"test_notebook_document__did_open"
"test_notebook_document__did_change"

# test/plugins/test_autoimport.py:322: AssertionError
# E assert False
# E + where False = any(<generator object test_autoimport_code_actions_and_completions_for_notebook_document.<locals>.<genexpr> at 0x7fff54a2eb20>)
"test_autoimport_code_actions_and_completions_for_notebook_document"
];
})
);
Expand Down
Loading