diff options
Diffstat (limited to 'lua')
4 files changed, 19 insertions, 21 deletions
diff --git a/lua/lspconfig/server_configurations/arduino_language_server.lua b/lua/lspconfig/server_configurations/arduino_language_server.lua index f1d73e2b..384a9c9f 100644 --- a/lua/lspconfig/server_configurations/arduino_language_server.lua +++ b/lua/lspconfig/server_configurations/arduino_language_server.lua @@ -1,9 +1,5 @@ local util = require 'lspconfig.util' -local default_capabilities = vim.lsp.protocol.make_client_capabilities() -default_capabilities.textDocument.semanticTokens = vim.NIL -default_capabilities.workspace.semanticTokens = vim.NIL - return { default_config = { filetypes = { 'arduino' }, @@ -11,7 +7,14 @@ return { cmd = { 'arduino-language-server', }, - capabilities = default_capabilities, + capabilities = { + textDocument = { + semanticTokens = vim.NIL, + }, + workspace = { + semanticTokens = vim.NIL, + }, + }, }, docs = { description = [[ diff --git a/lua/lspconfig/server_configurations/elmls.lua b/lua/lspconfig/server_configurations/elmls.lua index f42449d4..e3e63bcd 100644 --- a/lua/lspconfig/server_configurations/elmls.lua +++ b/lua/lspconfig/server_configurations/elmls.lua @@ -1,9 +1,6 @@ local util = require 'lspconfig.util' -local lsp = vim.lsp local api = vim.api -local default_capabilities = lsp.protocol.make_client_capabilities() -default_capabilities.offsetEncoding = { 'utf-8', 'utf-16' } local elm_root_pattern = util.root_pattern 'elm.json' return { @@ -23,6 +20,9 @@ return { disableElmLSDiagnostics = false, onlyUpdateDiagnosticsOnSave = false, }, + capabilities = { + offsetEncoding = { 'utf-8', 'utf-16' }, + }, }, docs = { description = [[ diff --git a/lua/lspconfig/server_configurations/fennel_ls.lua b/lua/lspconfig/server_configurations/fennel_ls.lua index 50a77399..aa4f643b 100644 --- a/lua/lspconfig/server_configurations/fennel_ls.lua +++ b/lua/lspconfig/server_configurations/fennel_ls.lua @@ -1,8 +1,5 @@ local util = require 'lspconfig.util' -local default_capabilities = vim.lsp.protocol.make_client_capabilities() -default_capabilities.offsetEncoding = { 'utf-8', 'utf-16' } - return { default_config = { cmd = { 'fennel-ls' }, @@ -11,7 +8,9 @@ return { return util.find_git_ancestor(dir) end, settings = {}, - capabilities = default_capabilities, + capabilities = { + offsetEncoding = { 'utf-8', 'utf-16' }, + }, }, docs = { description = [[ diff --git a/lua/lspconfig/server_configurations/rust_analyzer.lua b/lua/lspconfig/server_configurations/rust_analyzer.lua index 61dfdc1d..b89546a7 100644 --- a/lua/lspconfig/server_configurations/rust_analyzer.lua +++ b/lua/lspconfig/server_configurations/rust_analyzer.lua @@ -32,14 +32,6 @@ local function is_library(fname) end end -local function register_cap() - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities.experimental = { - serverStatusNotification = true, - } - return capabilities -end - return { default_config = { cmd = { 'rust-analyzer' }, @@ -80,7 +72,11 @@ return { or util.root_pattern 'rust-project.json'(fname) or util.find_git_ancestor(fname) end, - capabilities = register_cap(), + capabilities = { + experimental = { + serverStatusNotification = true, + }, + }, }, commands = { CargoReload = { |