feat(haskell): update haskell-tools to v4

AstroNvim · Jul 28, 2024 · 2f33a5b · 2f33a5b
1 parent de5139e
commit 2f33a5b
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 32 deletions.
diff --git a/lua/astrocommunity/pack/haskell/README.md b/lua/astrocommunity/pack/haskell/README.md
@@ -3,22 +3,21 @@
 Requires:
 
 - plenary.nvim: Since v3 droppped this requirement, it is handled by the pack
-during install.
+  during install.
 
 Optionally:
 
 - A local [hoogle](https://github.com/ndmitchell/hoogle) installation
-(recommended by haskell-tools)
+  (recommended by haskell-tools)
 - [fast-tags](https://github.com/elaforge/fast-tags) (recommended by
-haskell-tools)
+  haskell-tools)
 
 This plugin pack does the following:
 
 - Adds `haskell` treesitter parsers
 - Adds `haskell-language-server` language server
 - Adds `haskell-debug-adapter` dap adapter
-- Adds [haskell-tools.nvim](https://github.com/mrcjkb/haskell-tools.nvim)
-(either v2 or v3 depending on nvim version)
+- Adds [haskell-tools.nvim](https://github.com/mrcjkb/haskell-tools.nvim) (v3 or v4 depending on nvim version)
 - Adds `yaml` language pack
 - Adds `json` language pack
 - Adds `neotest` from Astrocommunity

diff --git a/lua/astrocommunity/pack/haskell/init.lua b/lua/astrocommunity/pack/haskell/init.lua
@@ -4,7 +4,7 @@ local is_available = function(plugin)
 end
 local haskell_ft = { "haskell", "lhaskell", "cabal", "cabalproject" }
 
-return {
+local pack = {
   { import = "astrocommunity.pack.yaml" }, -- stack.yaml
   { import = "astrocommunity.pack.json" }, -- hls.json
   { import = "astrocommunity.test.neotest" }, -- neotest-haskell
@@ -17,32 +17,6 @@ return {
       end
     end,
   },
-  {
-    "mrcjkb/haskell-tools.nvim",
-    ft = haskell_ft,
-    dependencies = {
-      -- vim.fn.has >= nvim 0.9 removes plenary dependency
-      { "nvim-lua/plenary.nvim", optional = vim.fn.has "nvim-0.9" == 1 },
-      { "nvim-telescope/telescope.nvim", optional = true },
-      { "mfussenegger/nvim-dap", optional = true },
-      {
-        "AstroNvim/astrolsp",
-        ---@type AstroLSPOpts
-        opts = {
-          ---@diagnostic disable: missing-fields
-          handlers = { hls = false },
-        },
-      },
-    },
-    -- vim.fn.has >= nvim 0.9 installs version 3
-    version = vim.fn.has "nvim-0.9" == 1 and "^3" or "^2",
-    init = function()
-      local astrolsp_avail, astrolsp = pcall(require, "astrolsp")
-      vim.g.haskell_tools = require("astrocore").extend_tbl({
-        hls = astrolsp_avail and { capabilities = astrolsp.config.capabilities, on_attach = astrolsp.on_attach } or {},
-      }, vim.g.haskell_tools)
-    end,
-  },
   {
     "williamboman/mason-lspconfig.nvim",
     optional = true,
@@ -99,3 +73,64 @@ return {
     end,
   },
 }
+
+if vim.fn.has "nvim-0.10" == 1 then
+  -- haskell-tools v4 supports neovim v0.10+
+  table.insert(pack, {
+    "mrcjkb/haskell-tools.nvim",
+    ft = haskell_ft,
+    dependencies = {
+      -- vim.fn.has >= nvim 0.9 removes plenary dependency
+      { "nvim-lua/plenary.nvim", optional = vim.fn.has "nvim-0.9" == 1 },
+      { "nvim-telescope/telescope.nvim", optional = true },
+      { "mfussenegger/nvim-dap", optional = true },
+      {
+        "AstroNvim/astrolsp",
+        ---@type AstroLSPOpts
+        opts = {
+          ---@diagnostic disable: missing-fields
+          handlers = { hls = false },
+        },
+      },
+    },
+    version = "^4",
+    init = function()
+      local astrolsp_avail, astrolsp = pcall(require, "astrolsp")
+      vim.g.haskell_tools = require("astrocore").extend_tbl({
+        hls = astrolsp_avail and { capabilities = astrolsp.config.capabilities, on_attach = astrolsp.on_attach } or {},
+      }, vim.g.haskell_tools)
+    end,
+  })
+else
+  -- TODO: Remove this with AstroNvim v5 when dropping Neovim v0.9 support
+  -- haskell-tools v3 is the last version that supports neovim v0.9
+  -- This is simply a copy/paste of the v3 configuration to be left alone just in case
+  -- the setup gets breaking changes and diverges.
+  table.insert(pack, {
+    "mrcjkb/haskell-tools.nvim",
+    ft = haskell_ft,
+    dependencies = {
+      -- vim.fn.has >= nvim 0.9 removes plenary dependency
+      { "nvim-lua/plenary.nvim", optional = vim.fn.has "nvim-0.9" == 1 },
+      { "nvim-telescope/telescope.nvim", optional = true },
+      { "mfussenegger/nvim-dap", optional = true },
+      {
+        "AstroNvim/astrolsp",
+        ---@type AstroLSPOpts
+        opts = {
+          ---@diagnostic disable: missing-fields
+          handlers = { hls = false },
+        },
+      },
+    },
+    version = "^3",
+    init = function()
+      local astrolsp_avail, astrolsp = pcall(require, "astrolsp")
+      vim.g.haskell_tools = require("astrocore").extend_tbl({
+        hls = astrolsp_avail and { capabilities = astrolsp.config.capabilities, on_attach = astrolsp.on_attach } or {},
+      }, vim.g.haskell_tools)
+    end,
+  })
+end
+
+return pack