NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-05-21 06:16:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

formatter/conform-nvim: fix formatters option type for correct merging

Browse source 
`conform-nvim.setupOpts.formatters.<name>` config definitions will be
merged instead of overridden
This commit is contained in:
Foo Bar 2026-03-13 08:18:08 +00:00
commit c8301a12bf
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/manual/release-notes/rl-0.9.md
View file

@ -294,4 +294,8 @@ https://github.com/gorbit99/codewindow.nvim
- Fix `vim.assistant.codecompanion-nvim` lazy loading with [blink-cmp]
[foobar14](https://github.com/foobar14):
- Fix `vim.formatter.conform-nvim.setupOpts.formatters` type for correct merging
<!-- vim: set textwidth=80: -->

4
modules/plugins/formatter/conform-nvim/conform-nvim.nix
View file

@ -1,7 +1,7 @@
{lib, ...}: let
inherit (lib.generators) mkLuaInline;
inherit (lib.options) mkOption mkEnableOption literalMD;
inherit (lib.types) attrs either nullOr listOf submodule str;
inherit (lib.types) attrs attrsOf either nullOr listOf submodule str;
inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.types) luaInline mkPluginSetupOption;
@ -49,7 +49,7 @@ in {
enable = mkEnableOption "lightweight yet powerful formatter plugin for Neovim [conform-nvim]";
setupOpts = mkPluginSetupOption "conform.nvim" {
formatters = mkOption {
type = formattersType;
type = attrsOf formattersType;
default = {};
description = "Custom formatters and overrides for built-in formatters.";
};