Skip to content

Commit 9ac2bd1

Browse files
committed
feat(lsp)!: don't auto-register client capabilities
1 parent d627020 commit 9ac2bd1

File tree

1 file changed

+1
-28
lines changed

1 file changed

+1
-28
lines changed

lua/haskell-tools/config/internal.lua

+1-28
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,10 @@
99
--- Merges the default config with `vim.g.haskell_tools`.
1010
---@brief ]]
1111

12-
local deps = require('haskell-tools.deps')
13-
1412
---@type haskell-tools.Config
1513
---@diagnostic disable-next-line: missing-fields
1614
local HTConfig = {}
1715

18-
local ht_capabilities = vim.lsp.protocol.make_client_capabilities()
19-
local cmp_capabilities = deps.if_available('cmp_nvim_lsp', function(cmp_nvim_lsp)
20-
return cmp_nvim_lsp.default_capabilities()
21-
end, {})
22-
local selection_range_capabilities = deps.if_available('lsp-selection-range', function(lsp_selection_range)
23-
return lsp_selection_range.update_capabilities {}
24-
end, {})
25-
local folding_range_capabilities = deps.if_available('ufo', function(_)
26-
return {
27-
textDocument = {
28-
foldingRange = {
29-
dynamicRegistration = false,
30-
lineFoldingOnly = true,
31-
},
32-
},
33-
}
34-
end, {})
35-
local capabilities = vim.tbl_deep_extend(
36-
'force',
37-
ht_capabilities,
38-
cmp_capabilities,
39-
selection_range_capabilities,
40-
folding_range_capabilities
41-
)
42-
4316
---@class haskell-tools.Config haskell-tools.nvim plugin configuration.
4417
local HTDefaultConfig = {
4518

@@ -155,7 +128,7 @@ local HTDefaultConfig = {
155128
---@type lsp.ClientCapabilities | nil LSP client capabilities.
156129
---@see vim.lsp.protocol.make_client_capabilities
157130
---@see vim.lsp.start
158-
capabilities = capabilities,
131+
capabilities = vim.lsp.protocol.make_client_capabilities(),
159132
---@type table | (fun(project_root:string|nil):table) | nil The haskell-language-server settings or a function that creates them. To view the default settings, run `haskell-language-server generate-default-config`.
160133
settings = function(project_root)
161134
local ht = require('haskell-tools')

0 commit comments

Comments
 (0)