Skip to content

Commit 35f73cd

Browse files
authored
fix: avoid overriding global default capabilities (#3181)
1 parent b124ef3 commit 35f73cd

File tree

4 files changed

+19
-21
lines changed

4 files changed

+19
-21
lines changed

lua/lspconfig/server_configurations/arduino_language_server.lua

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
local util = require 'lspconfig.util'
22

3-
local default_capabilities = vim.lsp.protocol.make_client_capabilities()
4-
default_capabilities.textDocument.semanticTokens = vim.NIL
5-
default_capabilities.workspace.semanticTokens = vim.NIL
6-
73
return {
84
default_config = {
95
filetypes = { 'arduino' },
106
root_dir = util.root_pattern '*.ino',
117
cmd = {
128
'arduino-language-server',
139
},
14-
capabilities = default_capabilities,
10+
capabilities = {
11+
textDocument = {
12+
semanticTokens = vim.NIL,
13+
},
14+
workspace = {
15+
semanticTokens = vim.NIL,
16+
},
17+
},
1518
},
1619
docs = {
1720
description = [[

lua/lspconfig/server_configurations/elmls.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
local util = require 'lspconfig.util'
2-
local lsp = vim.lsp
32
local api = vim.api
43

5-
local default_capabilities = lsp.protocol.make_client_capabilities()
6-
default_capabilities.offsetEncoding = { 'utf-8', 'utf-16' }
74
local elm_root_pattern = util.root_pattern 'elm.json'
85

96
return {
@@ -23,6 +20,9 @@ return {
2320
disableElmLSDiagnostics = false,
2421
onlyUpdateDiagnosticsOnSave = false,
2522
},
23+
capabilities = {
24+
offsetEncoding = { 'utf-8', 'utf-16' },
25+
},
2626
},
2727
docs = {
2828
description = [[

lua/lspconfig/server_configurations/fennel_ls.lua

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
local util = require 'lspconfig.util'
22

3-
local default_capabilities = vim.lsp.protocol.make_client_capabilities()
4-
default_capabilities.offsetEncoding = { 'utf-8', 'utf-16' }
5-
63
return {
74
default_config = {
85
cmd = { 'fennel-ls' },
@@ -11,7 +8,9 @@ return {
118
return util.find_git_ancestor(dir)
129
end,
1310
settings = {},
14-
capabilities = default_capabilities,
11+
capabilities = {
12+
offsetEncoding = { 'utf-8', 'utf-16' },
13+
},
1514
},
1615
docs = {
1716
description = [[

lua/lspconfig/server_configurations/rust_analyzer.lua

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@ local function is_library(fname)
3232
end
3333
end
3434

35-
local function register_cap()
36-
local capabilities = vim.lsp.protocol.make_client_capabilities()
37-
capabilities.experimental = {
38-
serverStatusNotification = true,
39-
}
40-
return capabilities
41-
end
42-
4335
return {
4436
default_config = {
4537
cmd = { 'rust-analyzer' },
@@ -80,7 +72,11 @@ return {
8072
or util.root_pattern 'rust-project.json'(fname)
8173
or util.find_git_ancestor(fname)
8274
end,
83-
capabilities = register_cap(),
75+
capabilities = {
76+
experimental = {
77+
serverStatusNotification = true,
78+
},
79+
},
8480
},
8581
commands = {
8682
CargoReload = {

0 commit comments

Comments
 (0)