From f72c25a5ce1c0c850e2c287b3071002d9e3b580c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 25 Nov 2025 23:16:45 -0600 Subject: [PATCH] plugins/dap-go: require dap to be explicitly enabled Instead of automatically enabling `plugins.dap`, require users to explicitly enable it. This prevents silent re-enabling of dap when a user has explicitly disabled it. --- plugins/by-name/dap-go/default.nix | 13 +++++++++---- .../test-sources/plugins/by-name/dap-go/default.nix | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/plugins/by-name/dap-go/default.nix b/plugins/by-name/dap-go/default.nix index df30a5aa..b114d3f6 100644 --- a/plugins/by-name/dap-go/default.nix +++ b/plugins/by-name/dap-go/default.nix @@ -1,4 +1,5 @@ { + config, lib, ... }: @@ -12,12 +13,16 @@ lib.nixvim.plugins.mkNeovimPlugin { # Manually supplied to nvim-dap config module callSetup = false; extraConfig = cfg: { - plugins.dap = { - enable = true; - extensionConfigLua = '' - require("dap-go").setup(${lib.nixvim.toLuaObject cfg.settings}) + assertions = lib.nixvim.mkAssertions "plugins.dap-go" { + assertion = config.plugins.dap.enable; + message = '' + You have to enable `plugins.dap` to use `plugins.dap-go`. ''; }; + + plugins.dap.extensionConfigLua = '' + require("dap-go").setup(${lib.nixvim.toLuaObject cfg.settings}) + ''; }; # NOTE: Renames added in https://github.com/nix-community/nixvim/pull/2897 (2025-01-26) imports = [ ./deprecations.nix ]; diff --git a/tests/test-sources/plugins/by-name/dap-go/default.nix b/tests/test-sources/plugins/by-name/dap-go/default.nix index 25c62312..0d5bbdd4 100644 --- a/tests/test-sources/plugins/by-name/dap-go/default.nix +++ b/tests/test-sources/plugins/by-name/dap-go/default.nix @@ -1,9 +1,11 @@ { empty = { + plugins.dap.enable = true; plugins.dap-go.enable = true; }; default = { + plugins.dap.enable = true; plugins.dap-go = { enable = true;