From eecb26b15d997cf9f9fbf70c509f170299496045 Mon Sep 17 00:00:00 2001 From: foobar14 <135308643+foobar14@users.noreply.github.com> Date: Sun, 15 Mar 2026 12:18:37 +0000 Subject: [PATCH] formatter/conform-nvim: fix `formatters` option type for correct merging (#1449) `conform-nvim.setupOpts.formatters.` config definitions will be merged instead of overridden Co-authored-by: Foo Bar --- docs/manual/release-notes/rl-0.9.md | 4 ++++ modules/plugins/formatter/conform-nvim/conform-nvim.nix | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index a7d44024..471073ca 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -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 + diff --git a/modules/plugins/formatter/conform-nvim/conform-nvim.nix b/modules/plugins/formatter/conform-nvim/conform-nvim.nix index 4e27f9f0..8a0fd417 100644 --- a/modules/plugins/formatter/conform-nvim/conform-nvim.nix +++ b/modules/plugins/formatter/conform-nvim/conform-nvim.nix @@ -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."; };