mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

plugins/dap: ensure extensions load after the main plugin (#526)

Browse source 
* plugins/dap: ensure extensions load after the main plugin

* plugins/dap: change extensionConfigLua to use mkOption

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>

* plugins/dap: remove redundant null check for extensionConfigLua

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>

---------

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
This commit is contained in:
Wolbyte 2023-08-17 19:03:21 +03:30 • committed by GitHub
parent 9f8ce75653
commit ad3598cada
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/dap/dap-go.nix
View file

@ -47,10 +47,11 @@ in {
mkIf cfg.enable {
extraPlugins = [cfg.package];
plugins.dap.enable = true;
extraConfigLua = ''
require("dap-go").setup(${helpers.toLuaObject options})
'';
plugins.dap = {
enable = true;
extensionConfigLua = ''
require("dap-go").setup(${helpers.toLuaObject options})
'';
};
};
}

48
plugins/dap/dap-python.nix
View file

@ -55,29 +55,31 @@ in {
mkIf cfg.enable {
extraPlugins = [cfg.package];
plugins.dap.enable = true;
plugins.dap = {
enable = true;
extraConfigLua = with helpers;
''
require("dap-python").setup("${cfg.adapterPythonPath}", ${toLuaObject options})
''
+ (optionalString (cfg.testRunners != null) ''
table.insert(require("dap-python").test_runners,
${
toLuaObject
(
builtins.mapAttrs (_: mkRaw) cfg.testRunners
)
})
'')
+ (optionalString (cfg.customConfigurations != null) ''
table.insert(require("dap").configurations.python, ${toLuaObject cfg.customConfigurations})
'')
+ (optionalString (cfg.resolvePython != null) ''
require("dap-python").resolve_python = ${toLuaObject (mkRaw cfg.resolvePython)}
'')
+ (optionalString (cfg.testRunner != null) ''
require("dap-python").test_runner = ${toLuaObject cfg.testRunner};
'');
extensionConfigLua = with helpers;
''
require("dap-python").setup("${cfg.adapterPythonPath}", ${toLuaObject options})
''
+ (optionalString (cfg.testRunners != null) ''
table.insert(require("dap-python").test_runners,
${
toLuaObject
(
builtins.mapAttrs (_: mkRaw) cfg.testRunners
)
})
'')
+ (optionalString (cfg.customConfigurations != null) ''
table.insert(require("dap").configurations.python, ${toLuaObject cfg.customConfigurations})
'')
+ (optionalString (cfg.resolvePython != null) ''
require("dap-python").resolve_python = ${toLuaObject (mkRaw cfg.resolvePython)}
'')
+ (optionalString (cfg.testRunner != null) ''
require("dap-python").test_runner = ${toLuaObject cfg.testRunner};
'');
};
};
}

10
plugins/dap/dap-ui.nix
View file

@ -219,10 +219,12 @@ in {
mkIf cfg.enable {
extraPlugins = [cfg.package];
plugins.dap.enable = true;
plugins.dap = {
enable = true;
extraConfigLua = ''
require("dapui").setup(${helpers.toLuaObject options});
'';
extensionConfigLua = ''
require("dapui").setup(${helpers.toLuaObject options});
'';
};
};
}

10
plugins/dap/dap-virtual-text.nix
View file

@ -82,10 +82,12 @@ in {
mkIf cfg.enable {
extraPlugins = [cfg.package];
plugins.dap.enable = true;
plugins.dap = {
enable = true;
extraConfigLua = ''
require("nvim-dap-virtual-text").setup(${helpers.toLuaObject options});
'';
extensionConfigLua = ''
require("nvim-dap-virtual-text").setup(${helpers.toLuaObject options});
'';
};
};
}

12
plugins/dap/default.nix
View file

@ -44,6 +44,15 @@ in
dapBreakpointRejected = mkSignOption "R" "Sign to indicate breakpoints rejected by the debug adapter.";
};
extensionConfigLua = mkOption {
type = types.lines;
description = ''
Extension configuration for dap. Don't use this directly !
'';
default = "";
internal = true;
};
};
config = let
@ -86,6 +95,7 @@ in
for sign_name, sign in pairs(__dap_signs) do
vim.fn.sign_define(sign_name, sign)
end
'');
'')
+ cfg.extensionConfigLua;
};
}