feat: support vim.lsp.config

Author: mrcjkb

README.md

@@ -331,11 +331,12 @@ To modify the default configuration, set `vim.g.haskell_tools`.
 
 ```lua
 vim.g.haskell_tools = {
-  ---@type ToolsOpts
+  ---@type haskell-tools.tools.Opts
   tools = {
     -- ...
   },
-  ---@type HaskellLspClientOpts
+  ---@type haskell-tools.lsp.ClientOpts
+  ---You can also configure these via `:h vim.lsp.config`, with the "hls" key.
   hls = {
     ---@param client number The LSP client ID.
     ---@param bufnr number The buffer number
@@ -345,7 +346,7 @@ vim.g.haskell_tools = {
     end,
     -- ...
   },
-  ---@type HTDapOpts
+  ---@type haskell-tools.dap.Opts
   dap = {
     -- ...
   },

doc/haskell-tools.txt

@@ -71,6 +71,7 @@ haskell-tools.Opts                                          *haskell-tools.Opts*
                                                   haskell-tools module options.
         {hls?}    (haskell-tools.lsp.ClientOpts)
                                                   haskell-language-server client options.
+                                                  You can also configure these via |vim.lsp.config|, with the `"hls"` key.
         {dap?}    (haskell-tools.dap.Opts)
                                                   debug adapter config for nvim-dap.
 
@@ -236,7 +237,7 @@ haskell-tools.lsp.ClientOpts                      *haskell-tools.lsp.ClientOpts*
                                                                                 LSP client capabilities.
         {settings?}          (fun(project_root:string|nil):table|table)
                                                                                 The haskell-language-server settings or a function that creates them.
-                                                                                 To view the default settings, run `haskell-language-server generate-default-config`.
+                                                                                To view the default settings, run `haskell-language-server generate-default-config`.
         {default_settings?}  (table)
                                                                                 The default haskell-language-server settings that will be used if no settings are specified or detected.
         {logfile?}           (string)

lua/haskell-tools/config/init.lua

@@ -41,6 +41,7 @@ vim.g.haskell_tools = vim.g.haskell_tools
 ---@field tools? haskell-tools.tools.Opts
 ---
 ---haskell-language-server client options.
+---You can also configure these via |vim.lsp.config|, with the `"hls"` key.
 ---@field hls? haskell-tools.lsp.ClientOpts
 ---
 ---debug adapter config for nvim-dap.
@@ -187,7 +188,7 @@ vim.g.haskell_tools = vim.g.haskell_tools
 ---@field capabilities? lsp.ClientCapabilities
 ---
 ---The haskell-language-server settings or a function that creates them.
---- To view the default settings, run `haskell-language-server generate-default-config`.
+---To view the default settings, run `haskell-language-server generate-default-config`.
 ---@field settings? (fun(project_root:string|nil):table) | table
 ---
 ---The default haskell-language-server settings that will be used if no settings are specified or detected.

lua/haskell-tools/lsp/init.lua

@@ -117,10 +117,11 @@ Hls.start = function(bufnr)
     return
   end
   local HtProjectHelpers = require('haskell-tools.project.helpers')
+  local LspHelpers = require('haskell-tools.lsp.helpers')
   local is_cabal = HtProjectHelpers.is_cabal_file(bufnr)
   local project_root = ht.project.root_dir(file)
   local hls_settings = type(hls_opts.settings) == 'function' and hls_opts.settings(project_root) or hls_opts.settings
-  local LspHelpers = require('haskell-tools.lsp.helpers')
+
   local cmd = LspHelpers.get_hls_cmd()
   local hls_bin = cmd[1]
   if vim.fn.executable(hls_bin) == 0 then
@@ -170,8 +171,8 @@ Hls.start = function(bufnr)
       fix_cabal_client(client)
     end,
   }
-  log.debug('LSP start options: lsp_start_opts')
-  local client_id = vim.lsp.start(lsp_start_opts)
+  local client_config = vim.tbl_deep_extend('force', {}, lsp_start_opts, vim.lsp.config['hls'] or {})
+  local client_id = vim.lsp.start(client_config)
   return client_id
 end