languages/haskell: remove invalid haskell-tools options

`:checkhealth` output:

```
- ⚠️ WARNING unrecognized configs in vim.g.haskell_tools: { "hls.enable", "tools.hover.enable", "hls.root_dir", "hls.filetypes" }
```
This commit is contained in:
poz 2026-05-13 02:45:28 +02:00
commit cbb2aa8ff2
No known key found for this signature in database
2 changed files with 4 additions and 22 deletions

View file

@ -476,6 +476,7 @@ https://github.com/gorbit99/codewindow.nvim
- Add Arduino support with [arduino-language-server]. - Add Arduino support with [arduino-language-server].
- Add GLSL support with [glsl_analyzer]. - Add GLSL support with [glsl_analyzer].
- Update fidget-nvim setupOpts and fix NvimTree issue. - Update fidget-nvim setupOpts and fix NvimTree issue.
- Remove `invalid haskell-tools options`.
[itscrystalline](https://github.com/itscrystalline): [itscrystalline](https://github.com/itscrystalline):

View file

@ -12,7 +12,7 @@
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.dag) entryAfter; inherit (lib.nvim.dag) entryAfter;
inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.lua) toLuaObject;
inherit (lib.meta) getExe'; inherit (lib.meta) getExe getExe';
inherit (lib.generators) mkLuaInline; inherit (lib.generators) mkLuaInline;
inherit (pkgs) haskellPackages; inherit (pkgs) haskellPackages;
@ -21,9 +21,7 @@
defaultServers = ["hls"]; defaultServers = ["hls"];
servers = { servers = {
hls = { hls = {
enable = false; cmd = [(getExe' pkgs.haskellPackages.haskell-language-server "haskell-language-server") "--lsp"];
cmd = [(getExe' pkgs.haskellPackages.haskell-language-server "haskell-language-server-wrapper") "--lsp"];
filetypes = ["haskell" "lhaskell"];
on_attach = on_attach =
mkLuaInline mkLuaInline
/* /*
@ -43,17 +41,6 @@
vim.keymap.set('n', '<localleader>rq', ht.repl.quit, opts) vim.keymap.set('n', '<localleader>rq', ht.repl.quit, opts)
end end
''; '';
root_dir =
mkLuaInline
/*
lua
*/
''
function(bufnr, on_dir)
local fname = vim.api.nvim_buf_get_name(bufnr)
on_dir(util.root_pattern('hie.yaml', 'stack.yaml', 'cabal.project', '*.cabal', 'package.yaml')(fname))
end
'';
settings = { settings = {
haskell = { haskell = {
formattingProvider = "ormolu"; formattingProvider = "ormolu";
@ -122,12 +109,6 @@ in {
'' ''
vim.g.haskell_tools = { vim.g.haskell_tools = {
${optionalString cfg.lsp.enable '' ${optionalString cfg.lsp.enable ''
-- LSP
tools = {
hover = {
enable = true,
},
},
hls = ${toLuaObject servers.hls}, hls = ${toLuaObject servers.hls},
''} ''}
${optionalString cfg.dap.enable '' ${optionalString cfg.dap.enable ''
@ -135,7 +116,7 @@ in {
cmd = ${ cmd = ${
if isList cfg.dap.package if isList cfg.dap.package
then toLuaObject cfg.dap.package then toLuaObject cfg.dap.package
else ''{"${cfg.dap.package}/bin/haskell-debug-adapter"}'' else ''{"${getExe cfg.dap.package}"}''
}, },
}, },
''} ''}