From dbba6e31f8c07b590ddd452575eafe1ad5499730 Mon Sep 17 00:00:00 2001
From: Shina <53410646+s7tya@users.noreply.github.com>
Date: Thu, 30 Apr 2026 20:24:44 +0900
Subject: [PATCH] fix(haskell): prevent mason-lspconfig from starting hls

---
 lua/lazyvim/plugins/extras/lang/haskell.lua | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/haskell.lua b/lua/lazyvim/plugins/extras/lang/haskell.lua
index cf4f3db6..2301c70c 100644
--- a/lua/lazyvim/plugins/extras/lang/haskell.lua
+++ b/lua/lazyvim/plugins/extras/lang/haskell.lua
@@ -50,11 +50,6 @@ return {
     },
   },
 
-  {
-    "mason-org/mason.nvim",
-    opts = { ensure_installed = { "haskell-language-server" } },
-  },
-
   {
     "mfussenegger/nvim-dap",
     optional = true,
@@ -132,13 +127,22 @@ return {
         haskell = { "hlint" },
       },
     },
+    dependencies = {
+      {
+        "mason-org/mason.nvim",
+        opts = { ensure_installed = { "hlint" } },
+      },
+    },
   },
 
-  -- Make sure lspconfig doesn't start hls,
+  -- Make sure neither lspconfig nor mason-lspconfig starts hls,
   -- as it conflicts with haskell-tools
   {
     "neovim/nvim-lspconfig",
     opts = {
+      servers = {
+        hls = {},
+      },
       setup = {
         hls = function()
           return true