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

languages/haskell: simplify attach function

Browse source
This commit is contained in:
Ching Pei Yang 2026-05-10 23:19:39 +02:00 • committed by Ching Pei Yang
commit 8a0073182f
1 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -200,7 +200,10 @@ in {
vim = {
extraPackages = [haskellPackages.cabal-fmt];
startPlugins = ["haskell-tools-nvim"];
globals.haskell_tools = let
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;
@ -208,7 +211,8 @@ in {
if binding.value != null
then "vim.keymap.set('n', ${toLuaObject binding.value}, ${action}, {buffer=bufnr, noremap=true, silent=true, desc=${toLuaObject binding.description}})"
else "";
generatedOnAttach = mkLuaInline ''
in
mkLuaInline ''
function(client, bufnr)
local ht = require("haskell-tools")
${mkBinding mappings.codeLensRun "vim.lsp.codelens.run"}
@ -219,17 +223,6 @@ in {
${mkBinding mappings.replQuit "function() vim.cmd('Haskell repl quit') end"}
end
'';
effectiveOnAttach =
if htCfg.setupOpts.hls.on_attach != null
then htCfg.setupOpts.hls.on_attach
else generatedOnAttach;
in
htCfg.setupOpts
// {
hls =
htCfg.setupOpts.hls
// {
on_attach = effectiveOnAttach;
};
};
};