Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions flake.lock

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

18 changes: 9 additions & 9 deletions flake/dev/flake.lock

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

24 changes: 23 additions & 1 deletion generated/rust-analyzer.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@
];
};
};
"rust-analyzer.assist.preferSelf" = {
description = ''
When inserting a type (e.g. in "fill match arms" assist), prefer to use `Self` over the type name where possible.
'';
pluginDefault = false;
type = {
kind = "boolean";
};
};
"rust-analyzer.assist.termSearch.borrowcheck" = {
description = ''
Enable borrow checking for term search code assists. If set to false, also there will be more suggestions, but some of them may not borrow-check.
Expand Down Expand Up @@ -896,6 +905,15 @@
];
};
};
"rust-analyzer.highlightRelated.branchExitPoints.enable" = {
description = ''
Enables highlighting of related return values while the cursor is on any `match`, `if`, or match arm arrow (`=>`).
'';
pluginDefault = true;
type = {
kind = "boolean";
};
};
"rust-analyzer.highlightRelated.breakPoints.enable" = {
description = ''
Enables highlighting of related references while the cursor is on `break`, `loop`, `while`, or `for` keywords.
Expand Down Expand Up @@ -2305,7 +2323,11 @@
};
"rust-analyzer.workspace.symbol.search.excludeImports" = {
description = ''
Exclude imports from symbol search.
Exclude all imports from workspace symbol search.

In addition to regular imports (which are always excluded),
this option removes public imports (better known as re-exports)
and removes imports that rename the imported symbol.
'';
pluginDefault = false;
type = {
Expand Down
5 changes: 4 additions & 1 deletion tests/test-sources/modules/clipboard.nix
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{ pkgs, ... }:
{
example-with-str = {
clipboard = {
Expand All @@ -21,7 +22,9 @@
example-with-raw-lua = {
clipboard = {
register.__raw = ''vim.env.SSH_TTY and "" or "unnamedplus"'';
providers.wl-copy.enable = true;

# wl-copy is only available on linux
providers.wl-copy.enable = pkgs.stdenv.hostPlatform.isLinux;
};
};
}
10 changes: 8 additions & 2 deletions tests/test-sources/plugins/by-name/clipboard-image/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{ pkgs, ... }:
{ pkgs, lib, ... }:
let
inherit (pkgs.stdenv) hostPlatform;
in
{
empty = {
plugins.clipboard-image = {
Expand All @@ -11,7 +14,10 @@
plugins.clipboard-image = {
enable = true;

clipboardPackage = pkgs.wl-clipboard;
clipboardPackage = lib.mkMerge [
(lib.mkIf hostPlatform.isLinux pkgs.wl-clipboard)
(lib.mkIf hostPlatform.isDarwin pkgs.pngpaste)
];
settings = {
default = {
img_dir = "img";
Expand Down
2 changes: 1 addition & 1 deletion version-info.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT MODIFY!
# This file was generated by ci/version-info/default.nix
nixpkgs_rev = "ceb24d94c6feaa4e8737a8e2bd3cf71c3a7eaaa0"
nixpkgs_rev = "be9e214982e20b8310878ac2baa063a961c1bdf6"
release = "25.11"
unstable = true

Expand Down