diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/nvim-lsp-installer/servers/init.lua | 14 | ||||
| -rw-r--r-- | lua/nvim-lsp-installer/settings.lua | 6 |
2 files changed, 2 insertions, 18 deletions
diff --git a/lua/nvim-lsp-installer/servers/init.lua b/lua/nvim-lsp-installer/servers/init.lua index 3f252b83..1e6cc056 100644 --- a/lua/nvim-lsp-installer/servers/init.lua +++ b/lua/nvim-lsp-installer/servers/init.lua @@ -5,20 +5,12 @@ local settings = require "nvim-lsp-installer.settings" local M = {} ----@param name string ----@return string -local function vscode_langservers_extracted(name) - return settings.current.allow_federated_servers and "vscode-langservers-extracted" - or "vscode-langservers-extracted_" .. name -end - -- By default the install dir will be the same as the server's name. -- There are two cases when servers should install to a different location: --- 1. federated server installations, (see :help nvim-lsp-installer-settings) --- 2. legacy reasons, where some servers were previously installed to a location different than their name +-- 1. Legacy reasons, where some servers were previously installed to a location different than their name +-- 2. There is a breaking change to a server that motivates changing its install dir (e.g. to "bust" existing installations). local INSTALL_DIRS = { ["bashls"] = "bash", - ["cssls"] = vscode_langservers_extracted "cssls", ["dockerls"] = "dockerfile", ["elixirls"] = "elixir", ["elmls"] = "elm", @@ -26,9 +18,7 @@ local INSTALL_DIRS = { ["eslintls"] = "eslint", ["gopls"] = "go", ["hls"] = "haskell", - ["html"] = vscode_langservers_extracted "html", ["intelephense"] = "php", - ["jsonls"] = vscode_langservers_extracted "jsonls", ["kotlin_language_server"] = "kotlin", ["phpactor"] = "phpactor-source", ["purescriptls"] = "purescript", diff --git a/lua/nvim-lsp-installer/settings.lua b/lua/nvim-lsp-installer/settings.lua index 66c59e19..a9a4bf74 100644 --- a/lua/nvim-lsp-installer/settings.lua +++ b/lua/nvim-lsp-installer/settings.lua @@ -40,12 +40,6 @@ local DEFAULT_SETTINGS = { -- debugging issues with server installations. log_level = vim.log.levels.INFO, - -- Whether to allow LSP servers to share the same installation directory. For some servers, this effectively causes - -- more than one server to be installed (and uninstalled) when executing `:LspInstall` and `:LspUninstall`. For - -- example, installing `cssls` will also install both `jsonls` and `html` (and the other ways around), as these all - -- share the same underlying package. - allow_federated_servers = true, - -- Limit for the maximum amount of servers to be installed at the same time. Once this limit is reached, any further -- servers that are requested to be installed will be put in a queue. max_concurrent_installers = 4, |