NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-06-26 22:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

languages/haskell-tools: move default on_attach to mkOption

Browse source
This commit is contained in:
Ching Pei Yang 2026-05-20 16:52:14 +02:00
commit f4ff31ab6b
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
1 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

45
modules/plugins/languages/haskell.nix
View file

@ -135,7 +135,26 @@ in {
on_attach = mkOption { on_attach = mkOption {
type = nullOr luaInline; type = nullOr luaInline;
description = "Function to run when HLS is attached. When null, mappings from the mappings option are used."; description = "Function to run when HLS is attached. When null, mappings from the mappings option are used.";
default = null; default = let
htCfg = cfg.extensions.haskell-tools;
keymapDefinitions = options.vim.languages.haskell.extensions.haskell-tools.mappings;
mappings = addDescriptionsToMappings htCfg.mappings keymapDefinitions;
mkBinding = binding: action:
if binding.value != null
then "vim.keymap.set('n', ${toLuaObject binding.value}, ${action}, {buffer=bufnr, noremap=true, silent=true, desc=${toLuaObject binding.description}})"
else "";
in
mkLuaInline ''
function(client, bufnr)
local ht = require("haskell-tools")
${mkBinding mappings.codeLensRun "vim.lsp.codelens.run"}
${mkBinding mappings.hoogleSignature "ht.hoogle.hoogle_signature"}
${mkBinding mappings.evalAll "ht.lsp.buf_eval_all"}
${mkBinding mappings.replToggle "function() vim.cmd('Haskell repl toggle') end"}
${mkBinding mappings.replToggleFile "function() vim.cmd('Haskell repl toggle ' .. vim.api.nvim_buf_get_name(0)) end"}
${mkBinding mappings.replQuit "function() vim.cmd('Haskell repl quit') end"}
end
'';
defaultText = literalExpression "Generated from vim.languages.haskell.extensions.haskell-tools.mappings"; defaultText = literalExpression "Generated from vim.languages.haskell.extensions.haskell-tools.mappings";
}; };
@ -231,30 +250,6 @@ in {
vim = { vim = {
startPlugins = ["haskell-tools-nvim"]; startPlugins = ["haskell-tools-nvim"];
globals.haskell_tools = cfg.extensions.haskell-tools.setupOpts; globals.haskell_tools = cfg.extensions.haskell-tools.setupOpts;
languages.haskell.extensions.haskell-tools.setupOpts = {
hls = {
on_attach = let
htCfg = cfg.extensions.haskell-tools;
keymapDefinitions = options.vim.languages.haskell.extensions.haskell-tools.mappings;
mappings = addDescriptionsToMappings htCfg.mappings keymapDefinitions;
mkBinding = binding: action:
if binding.value != null
then "vim.keymap.set('n', ${toLuaObject binding.value}, ${action}, {buffer=bufnr, noremap=true, silent=true, desc=${toLuaObject binding.description}})"
else "";
in
mkLuaInline ''
function(client, bufnr)
local ht = require("haskell-tools")
${mkBinding mappings.codeLensRun "vim.lsp.codelens.run"}
${mkBinding mappings.hoogleSignature "ht.hoogle.hoogle_signature"}
${mkBinding mappings.evalAll "ht.lsp.buf_eval_all"}
${mkBinding mappings.replToggle "function() vim.cmd('Haskell repl toggle') end"}
${mkBinding mappings.replToggleFile "function() vim.cmd('Haskell repl toggle ' .. vim.api.nvim_buf_get_name(0)) end"}
${mkBinding mappings.replQuit "function() vim.cmd('Haskell repl quit') end"}
end
'';
};
};
}; };
}) })
]); ]);