diff options
53 files changed, 380 insertions, 394 deletions
diff --git a/lua/nvim-lsp-installer.lua b/lua/nvim-lsp-installer.lua index a9ed77f2..af6cfc9f 100644 --- a/lua/nvim-lsp-installer.lua +++ b/lua/nvim-lsp-installer.lua @@ -1,50 +1,50 @@ -local notify = require("nvim-lsp-installer.notify") +local notify = require "nvim-lsp-installer.notify" local M = {} --- :'<,'>!sort | column -t +-- :'<,'>!sort local _SERVERS = { - ["angularls"] = require("nvim-lsp-installer.servers.angularls"), - ["ansiblels"] = require("nvim-lsp-installer.servers.ansiblels"), - ["bashls"] = require("nvim-lsp-installer.servers.bashls"), - ["clangd"] = require("nvim-lsp-installer.servers.clangd"), - ["clojure_lsp"] = require("nvim-lsp-installer.servers.clojure_lsp"), - ["cmake"] = require("nvim-lsp-installer.servers.cmake"), - ["cssls"] = require("nvim-lsp-installer.servers.cssls"), - ["denols"] = require("nvim-lsp-installer.servers.denols"), - ["dockerls"] = require("nvim-lsp-installer.servers.dockerls"), - ["elixirls"] = require("nvim-lsp-installer.servers.elixirls"), - ["elmls"] = require("nvim-lsp-installer.servers.elmls"), - ["ember"] = require("nvim-lsp-installer.servers.ember"), - ["eslintls"] = require("nvim-lsp-installer.servers.eslintls"), - ["fortls"] = require("nvim-lsp-installer.servers.fortls"), - ["gopls"] = require("nvim-lsp-installer.servers.gopls"), - ["graphql"] = require("nvim-lsp-installer.servers.graphql"), - ["groovyls"] = require("nvim-lsp-installer.servers.groovyls"), - ["hls"] = require("nvim-lsp-installer.servers.hls"), - ["html"] = require("nvim-lsp-installer.servers.html"), - ["intelephense"] = require("nvim-lsp-installer.servers.intelephense"), - ["jedi_language_server"] = require("nvim-lsp-installer.servers.jedi_language_server"), - ["jsonls"] = require("nvim-lsp-installer.servers.jsonls"), - ["kotlin_language_server"] = require("nvim-lsp-installer.servers.kotlin_language_server"), - ["omnisharp"] = require("nvim-lsp-installer.servers.omnisharp"), - ["purescript"] = require("nvim-lsp-installer.servers.purescriptls"), - ["pylsp"] = require("nvim-lsp-installer.servers.pylsp"), - ["pyright"] = require("nvim-lsp-installer.servers.pyright"), - ["rome"] = require("nvim-lsp-installer.servers.rome"), - ["rust_analyzer"] = require("nvim-lsp-installer.servers.rust_analyzer"), - ["solargraph"] = require("nvim-lsp-installer.servers.solargraph"), - ["sqlls"] = require("nvim-lsp-installer.servers.sqlls"), - ["sqls"] = require("nvim-lsp-installer.servers.sqls"), - ["sumneko_lua"] = require("nvim-lsp-installer.servers.sumneko_lua"), - ["svelte"] = require("nvim-lsp-installer.servers.svelte"), - ["tailwindcss"] = require("nvim-lsp-installer.servers.tailwindcss"), - ["terraformls"] = require("nvim-lsp-installer.servers.terraformls"), - ["texlab"] = require("nvim-lsp-installer.servers.texlab"), - ["tsserver"] = require("nvim-lsp-installer.servers.tsserver"), - ["vimls"] = require("nvim-lsp-installer.servers.vimls"), - ["vuels"] = require("nvim-lsp-installer.servers.vuels"), - ["yamlls"] = require("nvim-lsp-installer.servers.yamlls"), + ["angularls"] = require "nvim-lsp-installer.servers.angularls", + ["ansiblels"] = require "nvim-lsp-installer.servers.ansiblels", + ["bashls"] = require "nvim-lsp-installer.servers.bashls", + ["clangd"] = require "nvim-lsp-installer.servers.clangd", + ["clojure_lsp"] = require "nvim-lsp-installer.servers.clojure_lsp", + ["cmake"] = require "nvim-lsp-installer.servers.cmake", + ["cssls"] = require "nvim-lsp-installer.servers.cssls", + ["denols"] = require "nvim-lsp-installer.servers.denols", + ["dockerls"] = require "nvim-lsp-installer.servers.dockerls", + ["elixirls"] = require "nvim-lsp-installer.servers.elixirls", + ["elmls"] = require "nvim-lsp-installer.servers.elmls", + ["ember"] = require "nvim-lsp-installer.servers.ember", + ["eslintls"] = require "nvim-lsp-installer.servers.eslintls", + ["fortls"] = require "nvim-lsp-installer.servers.fortls", + ["gopls"] = require "nvim-lsp-installer.servers.gopls", + ["graphql"] = require "nvim-lsp-installer.servers.graphql", + ["groovyls"] = require "nvim-lsp-installer.servers.groovyls", + ["hls"] = require "nvim-lsp-installer.servers.hls", + ["html"] = require "nvim-lsp-installer.servers.html", + ["intelephense"] = require "nvim-lsp-installer.servers.intelephense", + ["jedi_language_server"] = require "nvim-lsp-installer.servers.jedi_language_server", + ["jsonls"] = require "nvim-lsp-installer.servers.jsonls", + ["kotlin_language_server"] = require "nvim-lsp-installer.servers.kotlin_language_server", + ["omnisharp"] = require "nvim-lsp-installer.servers.omnisharp", + ["purescript"] = require "nvim-lsp-installer.servers.purescriptls", + ["pylsp"] = require "nvim-lsp-installer.servers.pylsp", + ["pyright"] = require "nvim-lsp-installer.servers.pyright", + ["rome"] = require "nvim-lsp-installer.servers.rome", + ["rust_analyzer"] = require "nvim-lsp-installer.servers.rust_analyzer", + ["solargraph"] = require "nvim-lsp-installer.servers.solargraph", + ["sqlls"] = require "nvim-lsp-installer.servers.sqlls", + ["sqls"] = require "nvim-lsp-installer.servers.sqls", + ["sumneko_lua"] = require "nvim-lsp-installer.servers.sumneko_lua", + ["svelte"] = require "nvim-lsp-installer.servers.svelte", + ["tailwindcss"] = require "nvim-lsp-installer.servers.tailwindcss", + ["terraformls"] = require "nvim-lsp-installer.servers.terraformls", + ["texlab"] = require "nvim-lsp-installer.servers.texlab", + ["tsserver"] = require "nvim-lsp-installer.servers.tsserver", + ["vimls"] = require "nvim-lsp-installer.servers.vimls", + ["vuels"] = require "nvim-lsp-installer.servers.vuels", + ["yamlls"] = require "nvim-lsp-installer.servers.yamlls", } function M.get_server(server_name) @@ -60,21 +60,15 @@ function M.get_available_servers() end function M.get_installed_servers() - return vim.tbl_filter( - function (server) - return server:is_installed() - end, - M.get_available_servers() - ) + return vim.tbl_filter(function(server) + return server:is_installed() + end, M.get_available_servers()) end function M.get_uninstalled_servers() - return vim.tbl_filter( - function (server) - return not server:is_installed() - end, - M.get_available_servers() - ) + return vim.tbl_filter(function(server) + return not server:is_installed() + end, M.get_available_servers()) end function M.install(server_name) diff --git a/lua/nvim-lsp-installer/adapters/nvim-tree.lua b/lua/nvim-lsp-installer/adapters/nvim-tree.lua index 851f5ea8..20827373 100644 --- a/lua/nvim-lsp-installer/adapters/nvim-tree.lua +++ b/lua/nvim-lsp-installer/adapters/nvim-tree.lua @@ -1,15 +1,18 @@ -local notify = require("nvim-lsp-installer.notify") -local tsserverExtras = require("nvim-lsp-installer.extras.tsserver") +local notify = require "nvim-lsp-installer.notify" +local tsserverExtras = require "nvim-lsp-installer.extras.tsserver" local M = {} function M.connect() local ok, events = pcall(require, "nvim-tree.events") if not ok then - return notify("Unable to import nvim-tree module when connecting nvim-lsp-installer adapter.", vim.log.levels.ERROR) + return notify( + "Unable to import nvim-tree module when connecting nvim-lsp-installer adapter.", + vim.log.levels.ERROR + ) end - events.on_node_renamed(function (payload) + events.on_node_renamed(function(payload) -- TODO: not do this when renaming folders tsserverExtras.rename_file(payload.old_name, payload.new_name) end) diff --git a/lua/nvim-lsp-installer/extras/tsserver.lua b/lua/nvim-lsp-installer/extras/tsserver.lua index 8f724a75..e8a85227 100644 --- a/lua/nvim-lsp-installer/extras/tsserver.lua +++ b/lua/nvim-lsp-installer/extras/tsserver.lua @@ -1,4 +1,4 @@ -local extras = require'nvim-lsp-installer.extras.utils' +local extras = require "nvim-lsp-installer.extras.utils" local M = {} @@ -6,32 +6,24 @@ function M.rename_file(old, new) local old_uri = vim.uri_from_fname(old) local new_uri = vim.uri_from_fname(new) - extras.send_client_request( - 'tsserver', - 'workspace/executeCommand', - { - command = '_typescript.applyRenameFile', - arguments = { - { - sourceUri = old_uri, - targetUri = new_uri, - }, + extras.send_client_request("tsserver", "workspace/executeCommand", { + command = "_typescript.applyRenameFile", + arguments = { + { + sourceUri = old_uri, + targetUri = new_uri, }, - } - ) + }, + }) end function M.organize_imports(bufname) bufname = bufname or vim.api.nvim_buf_get_name(0) - extras.send_client_request( - 'tsserver', - 'workspace/executeCommand', - { - command = '_typescript.organizeImports', - arguments = {bufname}, - } - ) + extras.send_client_request("tsserver", "workspace/executeCommand", { + command = "_typescript.organizeImports", + arguments = { bufname }, + }) end return M diff --git a/lua/nvim-lsp-installer/installers/go.lua b/lua/nvim-lsp-installer/installers/go.lua index 903c62d8..c67b9565 100644 --- a/lua/nvim-lsp-installer/installers/go.lua +++ b/lua/nvim-lsp-installer/installers/go.lua @@ -1,5 +1,5 @@ -local path = require("nvim-lsp-installer.path") -local shell = require("nvim-lsp-installer.installers.shell") +local path = require "nvim-lsp-installer.path" +local shell = require "nvim-lsp-installer.installers.shell" local M = {} diff --git a/lua/nvim-lsp-installer/installers/init.lua b/lua/nvim-lsp-installer/installers/init.lua index 8cc0e34c..e9d99138 100644 --- a/lua/nvim-lsp-installer/installers/init.lua +++ b/lua/nvim-lsp-installer/installers/init.lua @@ -2,12 +2,12 @@ local M = {} function M.compose(installers) if #installers == 0 then - error("No installers to compose.") + error "No installers to compose." end - return function (server, callback) + return function(server, callback) local function execute(idx) - installers[idx](server, function (success, result) + installers[idx](server, function(success, result) if not success then -- oh no, error. exit early callback(success, result) diff --git a/lua/nvim-lsp-installer/installers/npm.lua b/lua/nvim-lsp-installer/installers/npm.lua index 882b7f92..02c2f533 100644 --- a/lua/nvim-lsp-installer/installers/npm.lua +++ b/lua/nvim-lsp-installer/installers/npm.lua @@ -1,5 +1,5 @@ -local path = require("nvim-lsp-installer.path") -local shell = require("nvim-lsp-installer.installers.shell") +local path = require "nvim-lsp-installer.path" +local shell = require "nvim-lsp-installer.installers.shell" local M = {} diff --git a/lua/nvim-lsp-installer/installers/pip3.lua b/lua/nvim-lsp-installer/installers/pip3.lua index 56482186..62996196 100644 --- a/lua/nvim-lsp-installer/installers/pip3.lua +++ b/lua/nvim-lsp-installer/installers/pip3.lua @@ -1,5 +1,5 @@ -local path = require("nvim-lsp-installer.path") -local shell = require("nvim-lsp-installer.installers.shell") +local path = require "nvim-lsp-installer.path" +local shell = require "nvim-lsp-installer.installers.shell" local M = {} @@ -7,7 +7,7 @@ local REL_INSTALL_DIR = "venv" function M.packages(packages) return shell.raw(("./%s/bin/pip3 install -U %s"):format(REL_INSTALL_DIR, table.concat(packages, " ")), { - prefix = ("set -euo pipefail; python3 -m venv %q;"):format(REL_INSTALL_DIR) + prefix = ("set -euo pipefail; python3 -m venv %q;"):format(REL_INSTALL_DIR), }) end diff --git a/lua/nvim-lsp-installer/installers/zx.lua b/lua/nvim-lsp-installer/installers/zx.lua index 1fae81c0..5308ac66 100644 --- a/lua/nvim-lsp-installer/installers/zx.lua +++ b/lua/nvim-lsp-installer/installers/zx.lua @@ -1,15 +1,15 @@ -local fs = require("nvim-lsp-installer.fs") -local path = require("nvim-lsp-installer.path") -local notify = require("nvim-lsp-installer.notify") -local installers = require("nvim-lsp-installer.installers") -local shell = require("nvim-lsp-installer.installers.shell") -local npm = require("nvim-lsp-installer.installers.npm") +local fs = require "nvim-lsp-installer.fs" +local path = require "nvim-lsp-installer.path" +local notify = require "nvim-lsp-installer.notify" +local installers = require "nvim-lsp-installer.installers" +local shell = require "nvim-lsp-installer.installers.shell" +local npm = require "nvim-lsp-installer.installers.npm" local uv = vim.loop local M = {} -local INSTALL_DIR = path.concat { vim.fn.stdpath("data"), "lsp_servers", ".zx" } +local INSTALL_DIR = path.concat { vim.fn.stdpath "data", "lsp_servers", ".zx" } local ZX_EXECUTABLE = npm.executable(INSTALL_DIR, "zx") local has_installed_zx = false @@ -17,13 +17,13 @@ local has_installed_zx = false local function zx_installer(force) force = force or false -- be careful with boolean logic if flipping this - return function (_, callback) + return function(_, callback) if has_installed_zx and not force then callback(true, "zx already installed") return end - if vim.fn.executable("npm") ~= 1 or vim.fn.executable("node") ~= 1 then + if vim.fn.executable "npm" ~= 1 or vim.fn.executable "node" ~= 1 then callback(false, "Cannot install zx because npm and/or node not installed.") return end @@ -43,7 +43,7 @@ local function zx_installer(force) args = { npm_command, "zx@1" }, cwd = INSTALL_DIR, }, - vim.schedule_wrap(function (code) + vim.schedule_wrap(function(code) if code ~= 0 then callback(false, "Failed to install zx.") return @@ -59,11 +59,8 @@ end function M.file(relpath) local script_path = path.realpath(relpath, 3) return installers.compose { - shell.raw(("%q %q"):format( - ZX_EXECUTABLE, - script_path - )), - zx_installer(false) + shell.raw(("%q %q"):format(ZX_EXECUTABLE, script_path)), + zx_installer(false), } end diff --git a/lua/nvim-lsp-installer/path.lua b/lua/nvim-lsp-installer/path.lua index 294d45e5..97e3ed20 100644 --- a/lua/nvim-lsp-installer/path.lua +++ b/lua/nvim-lsp-installer/path.lua @@ -1,24 +1,24 @@ local uv = vim.loop local sep = (function() ----@diagnostic disable-next-line: undefined-global - if jit then ----@diagnostic disable-next-line: undefined-global - local os = string.lower(jit.os) - if os == "linux" or os == "osx" or os == "bsd" then - return "/" + ---@diagnostic disable-next-line: undefined-global + if jit then + ---@diagnostic disable-next-line: undefined-global + local os = string.lower(jit.os) + if os == "linux" or os == "osx" or os == "bsd" then + return "/" + else + return "\\" + end else - return "\\" + return package.config:sub(1, 1) end - else - return package.config:sub(1, 1) - end end)() local M = {} function M.cwd() - return uv.fs_realpath(".") + return uv.fs_realpath "." end function M.concat(path_components) diff --git a/lua/nvim-lsp-installer/server.lua b/lua/nvim-lsp-installer/server.lua index 5747f39e..95797e10 100644 --- a/lua/nvim-lsp-installer/server.lua +++ b/lua/nvim-lsp-installer/server.lua @@ -1,11 +1,11 @@ -local notify = require("nvim-lsp-installer.notify") -local fs = require("nvim-lsp-installer.fs") -local path = require("nvim-lsp-installer.path") +local notify = require "nvim-lsp-installer.notify" +local fs = require "nvim-lsp-installer.fs" +local path = require "nvim-lsp-installer.path" local M = {} function M.get_server_root_path(server) - return path.concat { vim.fn.stdpath("data"), "lsp_servers", server } + return path.concat { vim.fn.stdpath "data", "lsp_servers", server } end M.Server = {} @@ -39,9 +39,7 @@ function M.Server:setup(opts) -- We require the lspconfig server here in order to do it as late as possible. -- The reason for this is because once a lspconfig server has been imported, it's -- automatically registered with lspconfig and causes it to show up in :LspInfo and whatnot. - require("lspconfig")[self.name].setup( - vim.tbl_deep_extend("force", self._default_options, opts) - ) + require("lspconfig")[self.name].setup(vim.tbl_deep_extend("force", self._default_options, opts)) end function M.Server:get_default_options() @@ -70,7 +68,7 @@ function M.Server:install() notify(("Installing %s…"):format(self.name)) - self._installer(self, function (success, result) + self._installer(self, function(success, result) if not success then notify(("Server installation failed for %s. %s"):format(self.name, result), vim.log.levels.ERROR) pcall(self.uninstall, self) diff --git a/lua/nvim-lsp-installer/servers/angularls/init.lua b/lua/nvim-lsp-installer/servers/angularls/init.lua index 14cde314..8de5b29f 100644 --- a/lua/nvim-lsp-installer/servers/angularls/init.lua +++ b/lua/nvim-lsp-installer/servers/angularls/init.lua @@ -1,19 +1,19 @@ -local util = require("lspconfig/util") -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local util = require "lspconfig/util" +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -- Angular requires a node_modules directory to probe for @angular/language-service and typescript -- in order to use your projects configured versions. -- This defaults to the vim cwd, but will get overwritten by the resolved root of the file. local function get_probe_dir(root_dir) - local project_root = util.find_node_modules_ancestor(root_dir) + local project_root = util.find_node_modules_ancestor(root_dir) - return project_root and (project_root .. "/node_modules") or "" + return project_root and (project_root .. "/node_modules") or "" end local default_probe_dir = get_probe_dir(vim.fn.getcwd()) -local root_dir = server.get_server_root_path("angularls") +local root_dir = server.get_server_root_path "angularls" local executable_path = npm.executable(root_dir, "ngserver") diff --git a/lua/nvim-lsp-installer/servers/ansiblels/init.lua b/lua/nvim-lsp-installer/servers/ansiblels/init.lua index e83ef4d6..2b40f084 100644 --- a/lua/nvim-lsp-installer/servers/ansiblels/init.lua +++ b/lua/nvim-lsp-installer/servers/ansiblels/init.lua @@ -1,8 +1,8 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local shell = require("nvim-lsp-installer.installers.shell") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local shell = require "nvim-lsp-installer.installers.shell" -local root_dir = server.get_server_root_path("ansiblels") +local root_dir = server.get_server_root_path "ansiblels" return server.Server:new { name = "ansiblels", @@ -16,5 +16,5 @@ return server.Server:new { default_options = { filetypes = { "yaml", "yaml.ansible" }, cmd = { "node", path.concat { root_dir, "out", "server", "src", "server.js" }, "--stdio" }, - } + }, } diff --git a/lua/nvim-lsp-installer/servers/bashls/init.lua b/lua/nvim-lsp-installer/servers/bashls/init.lua index e8a6f70f..fb341347 100644 --- a/lua/nvim-lsp-installer/servers/bashls/init.lua +++ b/lua/nvim-lsp-installer/servers/bashls/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("bash") +local root_dir = server.get_server_root_path "bash" return server.Server:new { name = "bashls", diff --git a/lua/nvim-lsp-installer/servers/clangd/init.lua b/lua/nvim-lsp-installer/servers/clangd/init.lua index 4183699a..f5a163f6 100644 --- a/lua/nvim-lsp-installer/servers/clangd/init.lua +++ b/lua/nvim-lsp-installer/servers/clangd/init.lua @@ -1,14 +1,14 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local zx = require("nvim-lsp-installer.installers.zx") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local zx = require "nvim-lsp-installer.installers.zx" -local root_dir = server.get_server_root_path("c-family") +local root_dir = server.get_server_root_path "c-family" return server.Server:new { - name = "clangd", - root_dir = root_dir, - installer = zx.file("./install.mjs"), - default_options = { - cmd = { path.concat { root_dir, "clangd", "bin", "clangd" } }, - } + name = "clangd", + root_dir = root_dir, + installer = zx.file "./install.mjs", + default_options = { + cmd = { path.concat { root_dir, "clangd", "bin", "clangd" } }, + }, } diff --git a/lua/nvim-lsp-installer/servers/clojure_lsp/init.lua b/lua/nvim-lsp-installer/servers/clojure_lsp/init.lua index 9a235a2d..6f54129e 100644 --- a/lua/nvim-lsp-installer/servers/clojure_lsp/init.lua +++ b/lua/nvim-lsp-installer/servers/clojure_lsp/init.lua @@ -1,13 +1,13 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local zx = require("nvim-lsp-installer.installers.zx") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local zx = require "nvim-lsp-installer.installers.zx" -local root_dir = server.get_server_root_path("clojure_lsp") +local root_dir = server.get_server_root_path "clojure_lsp" return server.Server:new { name = "clojure_lsp", root_dir = root_dir, - installer = zx.file("./install.mjs"), + installer = zx.file "./install.mjs", default_options = { cmd = { path.concat { root_dir, "clojure-lsp" } }, }, diff --git a/lua/nvim-lsp-installer/servers/cmake/init.lua b/lua/nvim-lsp-installer/servers/cmake/init.lua index 9c637311..5f4ec0c4 100644 --- a/lua/nvim-lsp-installer/servers/cmake/init.lua +++ b/lua/nvim-lsp-installer/servers/cmake/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local pip3 = require("nvim-lsp-installer.installers.pip3") +local server = require "nvim-lsp-installer.server" +local pip3 = require "nvim-lsp-installer.installers.pip3" -local root_dir = server.get_server_root_path("cmake") +local root_dir = server.get_server_root_path "cmake" return server.Server:new { name = "cmake", @@ -11,4 +11,3 @@ return server.Server:new { cmd = { pip3.executable(root_dir, "cmake-language-server") }, }, } - diff --git a/lua/nvim-lsp-installer/servers/cssls/init.lua b/lua/nvim-lsp-installer/servers/cssls/init.lua index caa2574a..17ec8c26 100644 --- a/lua/nvim-lsp-installer/servers/cssls/init.lua +++ b/lua/nvim-lsp-installer/servers/cssls/init.lua @@ -1,3 +1,3 @@ -local create_server = require("nvim-lsp-installer.servers.vscode-langservers-extracted") +local create_server = require "nvim-lsp-installer.servers.vscode-langservers-extracted" return create_server("cssls", "vscode-css-language-server") diff --git a/lua/nvim-lsp-installer/servers/denols/init.lua b/lua/nvim-lsp-installer/servers/denols/init.lua index 6df28510..fd8f684d 100644 --- a/lua/nvim-lsp-installer/servers/denols/init.lua +++ b/lua/nvim-lsp-installer/servers/denols/init.lua @@ -1,8 +1,8 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local shell = require("nvim-lsp-installer.installers.shell") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local shell = require "nvim-lsp-installer.installers.shell" -local root_dir = server.get_server_root_path("denols") +local root_dir = server.get_server_root_path "denols" local install_cmd = [=[ export DENO_INSTALL="$PWD" diff --git a/lua/nvim-lsp-installer/servers/dockerls/init.lua b/lua/nvim-lsp-installer/servers/dockerls/init.lua index 10b0cbec..886d5e7b 100644 --- a/lua/nvim-lsp-installer/servers/dockerls/init.lua +++ b/lua/nvim-lsp-installer/servers/dockerls/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("dockerfile") +local root_dir = server.get_server_root_path "dockerfile" return server.Server:new { name = "dockerls", diff --git a/lua/nvim-lsp-installer/servers/elixirls/init.lua b/lua/nvim-lsp-installer/servers/elixirls/init.lua index d5732baf..52f3acd0 100644 --- a/lua/nvim-lsp-installer/servers/elixirls/init.lua +++ b/lua/nvim-lsp-installer/servers/elixirls/init.lua @@ -1,20 +1,19 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local shell = require("nvim-lsp-installer.installers.shell") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local shell = require "nvim-lsp-installer.installers.shell" -local root_dir = server.get_server_root_path("elixir") +local root_dir = server.get_server_root_path "elixir" return server.Server:new { - name = "elixirls", - root_dir = root_dir, - installer = shell.raw [[ + name = "elixirls", + root_dir = root_dir, + installer = shell.raw [[ curl -fLO https://github.com/elixir-lsp/elixir-ls/releases/download/v0.7.0/elixir-ls.zip; unzip elixir-ls.zip -d elixir-ls; rm elixir-ls.zip; chmod +x elixir-ls/language_server.sh; ]], - default_options = { - cmd = { path.concat { root_dir, "elixir-ls", "language_server.sh" } }, - } + default_options = { + cmd = { path.concat { root_dir, "elixir-ls", "language_server.sh" } }, + }, } - diff --git a/lua/nvim-lsp-installer/servers/elmls/init.lua b/lua/nvim-lsp-installer/servers/elmls/init.lua index fc3653e5..db433412 100644 --- a/lua/nvim-lsp-installer/servers/elmls/init.lua +++ b/lua/nvim-lsp-installer/servers/elmls/init.lua @@ -1,19 +1,19 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("elm") +local root_dir = server.get_server_root_path "elm" return server.Server:new { - name = "elmls", - root_dir = root_dir, - installer = npm.packages { "elm", "elm-test", "elm-format", "@elm-tooling/elm-language-server" }, - default_options = { - cmd = { npm.executable(root_dir, "elm-language-server") }, - init_options = { - elmPath = npm.executable(root_dir, "elm"), - elmFormatPath = npm.executable(root_dir, "elm-format"), - elmTestPath = npm.executable(root_dir, "elm-test"), - elmAnalyseTrigger = "change", + name = "elmls", + root_dir = root_dir, + installer = npm.packages { "elm", "elm-test", "elm-format", "@elm-tooling/elm-language-server" }, + default_options = { + cmd = { npm.executable(root_dir, "elm-language-server") }, + init_options = { + elmPath = npm.executable(root_dir, "elm"), + elmFormatPath = npm.executable(root_dir, "elm-format"), + elmTestPath = npm.executable(root_dir, "elm-test"), + elmAnalyseTrigger = "change", + }, }, - } } diff --git a/lua/nvim-lsp-installer/servers/ember/init.lua b/lua/nvim-lsp-installer/servers/ember/init.lua index e9fa5369..c95d3318 100644 --- a/lua/nvim-lsp-installer/servers/ember/init.lua +++ b/lua/nvim-lsp-installer/servers/ember/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("ember") +local root_dir = server.get_server_root_path "ember" return server.Server:new { name = "ember", diff --git a/lua/nvim-lsp-installer/servers/eslintls/init.lua b/lua/nvim-lsp-installer/servers/eslintls/init.lua index 194f3e28..35bd1968 100644 --- a/lua/nvim-lsp-installer/servers/eslintls/init.lua +++ b/lua/nvim-lsp-installer/servers/eslintls/init.lua @@ -1,14 +1,14 @@ -local lspconfig = require("lspconfig") -local configs = require("lspconfig/configs") +local lspconfig = require "lspconfig" +local configs = require "lspconfig/configs" -local notify = require("nvim-lsp-installer.notify") -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local shell = require("nvim-lsp-installer.installers.shell") +local notify = require "nvim-lsp-installer.notify" +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local shell = require "nvim-lsp-installer.installers.shell" configs.eslintls = { default_config = { - filetypes = {"javascript", "javascriptreact", "typescript", "typescriptreact"}, + filetypes = { "javascript", "javascriptreact", "typescript", "typescriptreact" }, root_dir = lspconfig.util.root_pattern(".eslintrc*", "package.json", ".git"), -- Refer to https://github.com/Microsoft/vscode-eslint#settings-options for documentation. settings = { @@ -18,17 +18,17 @@ configs.eslintls = { disableRuleComment = { enable = true, -- "sameLine" might not work as expected, see https://github.com/williamboman/nvim-lsp-installer/issues/4 - location = "separateLine" + location = "separateLine", }, showDocumentation = { - enable = true - } + enable = true, + }, }, rulesCustomizations = {}, -- Automatically determine working directory by locating .eslintrc config files. -- -- It's recommended not to change this. - workingDirectory = {mode = "auto"}, + workingDirectory = { mode = "auto" }, -- If nodePath is a non-null/undefined value the eslint LSP runs into runtime exceptions. -- -- It's recommended not to change this. @@ -40,20 +40,20 @@ configs.eslintls = { -- It's recommended not to change this. workspaceFolder = { uri = "/", - name = "root" - } - } - } + name = "root", + }, + }, + }, } local ConfirmExecutionResult = { deny = 1, confirmationPending = 2, confirmationCanceled = 3, - approved = 4 + approved = 4, } -local root_dir = server.get_server_root_path("eslint") +local root_dir = server.get_server_root_path "eslint" local install_cmd = [[ git clone --depth 1 https://github.com/microsoft/vscode-eslint .; npm install; @@ -69,26 +69,26 @@ return server.Server:new { default_options = { cmd = { "node", path.concat { root_dir, "server", "out", "eslintServer.js" }, "--stdio" }, handlers = { - ["eslint/openDoc"] = function (_, _, open_doc) + ["eslint/openDoc"] = function(_, _, open_doc) os.execute(string.format("open %q", open_doc.url)) - return {id = nil, result = true} + return { id = nil, result = true } end, - ["eslint/confirmESLintExecution"] = function () + ["eslint/confirmESLintExecution"] = function() -- VSCode language servers have a policy to request explicit approval -- before applying code changes. We just approve it immediately. return ConfirmExecutionResult.approved end, - ["eslint/probeFailed"] = function () + ["eslint/probeFailed"] = function() notify("ESLint probe failed.", vim.log.levels.ERROR) - return {id = nil, result = true} + return { id = nil, result = true } end, - ["eslint/noLibrary"] = function () + ["eslint/noLibrary"] = function() notify("Unable to find ESLint library.", vim.log.levels.ERROR) - return {id = nil, result = true} + return { id = nil, result = true } end, - ["eslint/noConfig"] = function () + ["eslint/noConfig"] = function() notify("Unable to find ESLint configuration.", vim.log.levels.ERROR) - return {id = nil, result = true} + return { id = nil, result = true } end, }, }, diff --git a/lua/nvim-lsp-installer/servers/fortls/init.lua b/lua/nvim-lsp-installer/servers/fortls/init.lua index e53baa4b..3e37a07f 100644 --- a/lua/nvim-lsp-installer/servers/fortls/init.lua +++ b/lua/nvim-lsp-installer/servers/fortls/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local pip3 = require("nvim-lsp-installer.installers.pip3") +local server = require "nvim-lsp-installer.server" +local pip3 = require "nvim-lsp-installer.installers.pip3" -local root_dir = server.get_server_root_path("fortls") +local root_dir = server.get_server_root_path "fortls" return server.Server:new { name = "fortls", @@ -11,4 +11,3 @@ return server.Server:new { cmd = { pip3.executable(root_dir, "fortls") }, }, } - diff --git a/lua/nvim-lsp-installer/servers/gopls/init.lua b/lua/nvim-lsp-installer/servers/gopls/init.lua index 71127327..0563bb0a 100644 --- a/lua/nvim-lsp-installer/servers/gopls/init.lua +++ b/lua/nvim-lsp-installer/servers/gopls/init.lua @@ -1,14 +1,14 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local go = require("nvim-lsp-installer.installers.go") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local go = require "nvim-lsp-installer.installers.go" -local root_dir = server.get_server_root_path("go") +local root_dir = server.get_server_root_path "go" return server.Server:new { - name = "gopls", - root_dir = root_dir, - installer = go.packages { "golang.org/x/tools/gopls@latest" }, - default_options = { - cmd = { go.executable(root_dir, "gopls") }, - } + name = "gopls", + root_dir = root_dir, + installer = go.packages { "golang.org/x/tools/gopls@latest" }, + default_options = { + cmd = { go.executable(root_dir, "gopls") }, + }, } diff --git a/lua/nvim-lsp-installer/servers/graphql/init.lua b/lua/nvim-lsp-installer/servers/graphql/init.lua index ec4ecb8f..5bfac4fe 100644 --- a/lua/nvim-lsp-installer/servers/graphql/init.lua +++ b/lua/nvim-lsp-installer/servers/graphql/init.lua @@ -1,33 +1,33 @@ -local util = require("lspconfig.util") +local util = require "lspconfig.util" -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("graphql") +local root_dir = server.get_server_root_path "graphql" return server.Server:new { name = "graphql", root_dir = root_dir, - installer = npm.packages { "graphql-language-service-cli@latest", "graphql" }, + installer = npm.packages { "graphql-language-service-cli@latest", "graphql" }, default_options = { cmd = { npm.executable(root_dir, "graphql-lsp"), "server", "-m", "stream" }, filetypes = { "typescriptreact", "javascriptreact", "graphql" }, root_dir = util.root_pattern( - -- Sourced from https://graphql-config.com/usage/ and https://git.io/Js2dt - "package.json", - "graphql.config.json", - "graphql.config.js", - "graphql.config.ts", - "graphql.config.toml", - "graphql.config.yaml", - "graphql.config.yml", - ".graphqlrc", - ".graphqlrc.json", - ".graphqlrc.toml", - ".graphqlrc.yaml", - ".graphqlrc.yml", - ".graphqlrc.js", - ".graphqlrc.ts" + -- Sourced from https://graphql-config.com/usage/ and https://git.io/Js2dt + "package.json", + "graphql.config.json", + "graphql.config.js", + "graphql.config.ts", + "graphql.config.toml", + "graphql.config.yaml", + "graphql.config.yml", + ".graphqlrc", + ".graphqlrc.json", + ".graphqlrc.toml", + ".graphqlrc.yaml", + ".graphqlrc.yml", + ".graphqlrc.js", + ".graphqlrc.ts" ), }, } diff --git a/lua/nvim-lsp-installer/servers/groovyls/init.lua b/lua/nvim-lsp-installer/servers/groovyls/init.lua index e4cf661f..357992a1 100644 --- a/lua/nvim-lsp-installer/servers/groovyls/init.lua +++ b/lua/nvim-lsp-installer/servers/groovyls/init.lua @@ -1,15 +1,15 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local shell = require("nvim-lsp-installer.installers.shell") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local shell = require "nvim-lsp-installer.installers.shell" -local root_dir = server.get_server_root_path("groovyls") +local root_dir = server.get_server_root_path "groovyls" return server.Server:new { name = "groovyls", root_dir = root_dir, - pre_install_check = function () - if vim.fn.executable("javac") ~= 1 then - error("Missing a Javac installation.") + pre_install_check = function() + if vim.fn.executable "javac" ~= 1 then + error "Missing a Javac installation." end end, installer = shell.raw [[ diff --git a/lua/nvim-lsp-installer/servers/hls/init.lua b/lua/nvim-lsp-installer/servers/hls/init.lua index 84fe023f..b19d4a39 100644 --- a/lua/nvim-lsp-installer/servers/hls/init.lua +++ b/lua/nvim-lsp-installer/servers/hls/init.lua @@ -1,13 +1,13 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local zx = require("nvim-lsp-installer.installers.zx") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local zx = require "nvim-lsp-installer.installers.zx" -local root_dir = server.get_server_root_path("haskell") +local root_dir = server.get_server_root_path "haskell" return server.Server:new { name = "hls", root_dir = root_dir, - installer = zx.file("./install.mjs"), + installer = zx.file "./install.mjs", default_options = { cmd = { path.concat { root_dir, "hls" } }, }, diff --git a/lua/nvim-lsp-installer/servers/html/init.lua b/lua/nvim-lsp-installer/servers/html/init.lua index 9f3e4b83..6d397b77 100644 --- a/lua/nvim-lsp-installer/servers/html/init.lua +++ b/lua/nvim-lsp-installer/servers/html/init.lua @@ -1,3 +1,3 @@ -local create_server = require("nvim-lsp-installer.servers.vscode-langservers-extracted") +local create_server = require "nvim-lsp-installer.servers.vscode-langservers-extracted" return create_server("html", "vscode-html-language-server") diff --git a/lua/nvim-lsp-installer/servers/intelephense/init.lua b/lua/nvim-lsp-installer/servers/intelephense/init.lua index a878cc16..a20ab8f2 100644 --- a/lua/nvim-lsp-installer/servers/intelephense/init.lua +++ b/lua/nvim-lsp-installer/servers/intelephense/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("php") +local root_dir = server.get_server_root_path "php" return server.Server:new { name = "intelephense", diff --git a/lua/nvim-lsp-installer/servers/jedi_language_server/init.lua b/lua/nvim-lsp-installer/servers/jedi_language_server/init.lua index 025886b9..902dca95 100644 --- a/lua/nvim-lsp-installer/servers/jedi_language_server/init.lua +++ b/lua/nvim-lsp-installer/servers/jedi_language_server/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local pip3 = require("nvim-lsp-installer.installers.pip3") +local server = require "nvim-lsp-installer.server" +local pip3 = require "nvim-lsp-installer.installers.pip3" -local root_dir = server.get_server_root_path("jedi_language_server") +local root_dir = server.get_server_root_path "jedi_language_server" return server.Server:new { name = "jedi_language_server", diff --git a/lua/nvim-lsp-installer/servers/jsonls/init.lua b/lua/nvim-lsp-installer/servers/jsonls/init.lua index 186e6d49..20147d88 100644 --- a/lua/nvim-lsp-installer/servers/jsonls/init.lua +++ b/lua/nvim-lsp-installer/servers/jsonls/init.lua @@ -1,3 +1,3 @@ -local create_server = require("nvim-lsp-installer.servers.vscode-langservers-extracted") +local create_server = require "nvim-lsp-installer.servers.vscode-langservers-extracted" return create_server("jsonls", "vscode-json-language-server") diff --git a/lua/nvim-lsp-installer/servers/kotlin_language_server/init.lua b/lua/nvim-lsp-installer/servers/kotlin_language_server/init.lua index 2e8c0841..d17da911 100644 --- a/lua/nvim-lsp-installer/servers/kotlin_language_server/init.lua +++ b/lua/nvim-lsp-installer/servers/kotlin_language_server/init.lua @@ -1,8 +1,8 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local shell = require("nvim-lsp-installer.installers.shell") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local shell = require "nvim-lsp-installer.installers.shell" -local root_dir = server.get_server_root_path("kotlin") +local root_dir = server.get_server_root_path "kotlin" return server.Server:new { name = "kotlin_language_server", diff --git a/lua/nvim-lsp-installer/servers/omnisharp/init.lua b/lua/nvim-lsp-installer/servers/omnisharp/init.lua index 970b38b1..5b108a58 100644 --- a/lua/nvim-lsp-installer/servers/omnisharp/init.lua +++ b/lua/nvim-lsp-installer/servers/omnisharp/init.lua @@ -1,13 +1,13 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local zx = require("nvim-lsp-installer.installers.zx") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local zx = require "nvim-lsp-installer.installers.zx" -local root_dir = server.get_server_root_path("omnisharp") +local root_dir = server.get_server_root_path "omnisharp" return server.Server:new { name = "omnisharp", root_dir = root_dir, - installer = zx.file("./install.mjs"), + installer = zx.file "./install.mjs", default_options = { cmd = { path.concat { root_dir, "omnisharp", "run" }, diff --git a/lua/nvim-lsp-installer/servers/purescriptls/init.lua b/lua/nvim-lsp-installer/servers/purescriptls/init.lua index 204b7571..05f98560 100644 --- a/lua/nvim-lsp-installer/servers/purescriptls/init.lua +++ b/lua/nvim-lsp-installer/servers/purescriptls/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("purescript") +local root_dir = server.get_server_root_path "purescript" return server.Server:new { name = "purescriptls", diff --git a/lua/nvim-lsp-installer/servers/pylsp/init.lua b/lua/nvim-lsp-installer/servers/pylsp/init.lua index d8716a48..5202f16d 100644 --- a/lua/nvim-lsp-installer/servers/pylsp/init.lua +++ b/lua/nvim-lsp-installer/servers/pylsp/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local pip3 = require("nvim-lsp-installer.installers.pip3") +local server = require "nvim-lsp-installer.server" +local pip3 = require "nvim-lsp-installer.installers.pip3" -local root_dir = server.get_server_root_path("pylsp") +local root_dir = server.get_server_root_path "pylsp" return server.Server:new { name = "pylsp", diff --git a/lua/nvim-lsp-installer/servers/pyright/init.lua b/lua/nvim-lsp-installer/servers/pyright/init.lua index 17f8e6f3..298dd7bb 100644 --- a/lua/nvim-lsp-installer/servers/pyright/init.lua +++ b/lua/nvim-lsp-installer/servers/pyright/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("python") +local root_dir = server.get_server_root_path "python" return server.Server:new { name = "pyright", diff --git a/lua/nvim-lsp-installer/servers/rome/init.lua b/lua/nvim-lsp-installer/servers/rome/init.lua index 4d7a7843..f6df8f51 100644 --- a/lua/nvim-lsp-installer/servers/rome/init.lua +++ b/lua/nvim-lsp-installer/servers/rome/init.lua @@ -1,13 +1,13 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("rome") +local root_dir = server.get_server_root_path "rome" return server.Server:new { name = "rome", root_dir = root_dir, installer = npm.packages { "rome@10.0.7-nightly.2021.7.2" }, -- https://github.com/rome/tools/pull/1409 default_options = { - cmd = { npm.executable(root_dir, "rome") , "lsp" }, + cmd = { npm.executable(root_dir, "rome"), "lsp" }, }, } diff --git a/lua/nvim-lsp-installer/servers/rust_analyzer/init.lua b/lua/nvim-lsp-installer/servers/rust_analyzer/init.lua index f959cd69..6502ee07 100644 --- a/lua/nvim-lsp-installer/servers/rust_analyzer/init.lua +++ b/lua/nvim-lsp-installer/servers/rust_analyzer/init.lua @@ -1,13 +1,13 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local zx = require("nvim-lsp-installer.installers.zx") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local zx = require "nvim-lsp-installer.installers.zx" -local root_dir = server.get_server_root_path("rust") +local root_dir = server.get_server_root_path "rust" return server.Server:new { name = "rust_analyzer", root_dir = root_dir, - installer = zx.file("./install.mjs"), + installer = zx.file "./install.mjs", default_options = { cmd = { path.concat { root_dir, "rust-analyzer" } }, }, diff --git a/lua/nvim-lsp-installer/servers/solargraph/init.lua b/lua/nvim-lsp-installer/servers/solargraph/init.lua index 630cc15c..fdad4861 100644 --- a/lua/nvim-lsp-installer/servers/solargraph/init.lua +++ b/lua/nvim-lsp-installer/servers/solargraph/init.lua @@ -1,19 +1,19 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local zx = require("nvim-lsp-installer.installers.zx") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local zx = require "nvim-lsp-installer.installers.zx" -local root_dir = server.get_server_root_path("ruby") +local root_dir = server.get_server_root_path "ruby" return server.Server:new { name = "solargraph", root_dir = root_dir, - installer = zx.file("./install.mjs"), - pre_install_check = function () - if vim.fn.executable("bundle") ~= 1 then - error("bundle not installed") + installer = zx.file "./install.mjs", + pre_install_check = function() + if vim.fn.executable "bundle" ~= 1 then + error "bundle not installed" end end, default_options = { cmd = { path.concat { root_dir, "solargraph", "solargraph" }, "stdio" }, - } + }, } diff --git a/lua/nvim-lsp-installer/servers/sqlls/init.lua b/lua/nvim-lsp-installer/servers/sqlls/init.lua index d2c9ef68..bafe287f 100644 --- a/lua/nvim-lsp-installer/servers/sqlls/init.lua +++ b/lua/nvim-lsp-installer/servers/sqlls/init.lua @@ -1,13 +1,13 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("sqlls") +local root_dir = server.get_server_root_path "sqlls" return server.Server:new { - name = "sqlls", - root_dir = root_dir, - installer = npm.packages { "sql-language-server" }, - default_options = { - cmd = { npm.executable(root_dir, "sql-language-server") }, - } + name = "sqlls", + root_dir = root_dir, + installer = npm.packages { "sql-language-server" }, + default_options = { + cmd = { npm.executable(root_dir, "sql-language-server") }, + }, } diff --git a/lua/nvim-lsp-installer/servers/sqls/init.lua b/lua/nvim-lsp-installer/servers/sqls/init.lua index 5a9eebbc..6c892ab8 100644 --- a/lua/nvim-lsp-installer/servers/sqls/init.lua +++ b/lua/nvim-lsp-installer/servers/sqls/init.lua @@ -1,13 +1,13 @@ -local server = require("nvim-lsp-installer.server") -local go = require("nvim-lsp-installer.installers.go") +local server = require "nvim-lsp-installer.server" +local go = require "nvim-lsp-installer.installers.go" -local root_dir = server.get_server_root_path("sqls") +local root_dir = server.get_server_root_path "sqls" return server.Server:new { - name = "sqls", - root_dir = root_dir, - installer = go.packages { "github.com/lighttiger2505/sqls" }, - default_options = { - cmd = { go.executable(root_dir, "sqls") }, - } + name = "sqls", + root_dir = root_dir, + installer = go.packages { "github.com/lighttiger2505/sqls" }, + default_options = { + cmd = { go.executable(root_dir, "sqls") }, + }, } diff --git a/lua/nvim-lsp-installer/servers/sumneko_lua/init.lua b/lua/nvim-lsp-installer/servers/sumneko_lua/init.lua index 01828749..bda3718c 100644 --- a/lua/nvim-lsp-installer/servers/sumneko_lua/init.lua +++ b/lua/nvim-lsp-installer/servers/sumneko_lua/init.lua @@ -1,8 +1,8 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local zx = require("nvim-lsp-installer.installers.zx") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local zx = require "nvim-lsp-installer.installers.zx" -local root_dir = server.get_server_root_path("lua") +local root_dir = server.get_server_root_path "lua" local uname_alias = { Darwin = "macOS", @@ -13,29 +13,33 @@ local bin_dir = uname_alias[uname] or uname return server.Server:new { name = "sumneko_lua", root_dir = root_dir, - installer = zx.file("./install.mjs"), + installer = zx.file "./install.mjs", pre_install_check = function() - if vim.fn.executable("ninja") ~= 1 then - error("ninja not installed (see https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages)") + if vim.fn.executable "ninja" ~= 1 then + error "ninja not installed (see https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages)" end end, default_options = { - cmd = { path.concat { root_dir, "bin", bin_dir, "lua-language-server" }, "-E", path.concat { root_dir, "main.lua" } }, + cmd = { + path.concat { root_dir, "bin", bin_dir, "lua-language-server" }, + "-E", + path.concat { root_dir, "main.lua" }, + }, settings = { Lua = { diagnostics = { -- Get the language server to recognize the `vim` global - globals = {"vim"} + globals = { "vim" }, }, workspace = { -- Make the server aware of Neovim runtime files library = { - [vim.fn.expand("$VIMRUNTIME/lua")] = true, - [vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true, + [vim.fn.expand "$VIMRUNTIME/lua"] = true, + [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true, }, - maxPreload = 10000 - } - } + maxPreload = 10000, + }, + }, }, - } + }, } diff --git a/lua/nvim-lsp-installer/servers/svelte/init.lua b/lua/nvim-lsp-installer/servers/svelte/init.lua index 9181f41a..f6a60295 100644 --- a/lua/nvim-lsp-installer/servers/svelte/init.lua +++ b/lua/nvim-lsp-installer/servers/svelte/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("svelte") +local root_dir = server.get_server_root_path "svelte" return server.Server:new { name = "svelte", diff --git a/lua/nvim-lsp-installer/servers/tailwindcss/init.lua b/lua/nvim-lsp-installer/servers/tailwindcss/init.lua index 781329c4..e4056771 100644 --- a/lua/nvim-lsp-installer/servers/tailwindcss/init.lua +++ b/lua/nvim-lsp-installer/servers/tailwindcss/init.lua @@ -1,19 +1,18 @@ -local server = require('nvim-lsp-installer.server') -local path = require("nvim-lsp-installer.path") -local zx = require("nvim-lsp-installer.installers.zx") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local zx = require "nvim-lsp-installer.installers.zx" -local root_dir = server.get_server_root_path("tailwindcss") +local root_dir = server.get_server_root_path "tailwindcss" return server.Server:new { name = "tailwindcss", root_dir = root_dir, - installer = zx.file("./install.mjs"), + installer = zx.file "./install.mjs", default_options = { cmd = { "node", path.concat { root_dir, "tailwindcss", "extension", "dist", "server", "tailwindServer.js" }, - "--stdio" + "--stdio", }, - } + }, } - diff --git a/lua/nvim-lsp-installer/servers/terraformls/init.lua b/lua/nvim-lsp-installer/servers/terraformls/init.lua index e338a7c6..1fce1669 100644 --- a/lua/nvim-lsp-installer/servers/terraformls/init.lua +++ b/lua/nvim-lsp-installer/servers/terraformls/init.lua @@ -1,13 +1,13 @@ -local server = require("nvim-lsp-installer.server") -local path = require("nvim-lsp-installer.path") -local zx = require("nvim-lsp-installer.installers.zx") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local zx = require "nvim-lsp-installer.installers.zx" -local root_dir = server.get_server_root_path("terraform") +local root_dir = server.get_server_root_path "terraform" return server.Server:new { name = "terraformls", root_dir = root_dir, - installer = zx.file("./install.mjs"), + installer = zx.file "./install.mjs", default_options = { cmd = { path.concat { root_dir, "terraform-ls", "terraform-ls" }, "serve" }, }, diff --git a/lua/nvim-lsp-installer/servers/texlab/init.lua b/lua/nvim-lsp-installer/servers/texlab/init.lua index 45c7c17a..2e3eeea3 100644 --- a/lua/nvim-lsp-installer/servers/texlab/init.lua +++ b/lua/nvim-lsp-installer/servers/texlab/init.lua @@ -1,21 +1,21 @@ -local server = require('nvim-lsp-installer.server') -local path = require("nvim-lsp-installer.path") -local zx = require("nvim-lsp-installer.installers.zx") +local server = require "nvim-lsp-installer.server" +local path = require "nvim-lsp-installer.path" +local zx = require "nvim-lsp-installer.installers.zx" -local root_dir = server.get_server_root_path('latex') +local root_dir = server.get_server_root_path "latex" return server.Server:new { - name = "texlab", - root_dir = root_dir, - installer = zx.file("./install.mjs"), - pre_install_check = function () - if vim.fn.executable("wget") ~=1 then - error("Missing wget. Please, refer to https://www.gnu.org/software/wget/ to install it.") - elseif vim.fn.executable("pdflatex") ~=1 then - error("The program pdflatex wasn't found. Please install a TeX distribution: https://www.latex-project.org/get/#tex-distributions") - end - end, - default_options = { - cmd = { path.concat { root_dir, "texlab" } }, - } + name = "texlab", + root_dir = root_dir, + installer = zx.file "./install.mjs", + pre_install_check = function() + if vim.fn.executable "wget" ~= 1 then + error "Missing wget. Please, refer to https://www.gnu.org/software/wget/ to install it." + elseif vim.fn.executable "pdflatex" ~= 1 then + error "The program pdflatex wasn't found. Please install a TeX distribution: https://www.latex-project.org/get/#tex-distributions" + end + end, + default_options = { + cmd = { path.concat { root_dir, "texlab" } }, + }, } diff --git a/lua/nvim-lsp-installer/servers/tsserver/init.lua b/lua/nvim-lsp-installer/servers/tsserver/init.lua index a6baf82e..99957f1a 100644 --- a/lua/nvim-lsp-installer/servers/tsserver/init.lua +++ b/lua/nvim-lsp-installer/servers/tsserver/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("tsserver") +local root_dir = server.get_server_root_path "tsserver" return server.Server:new { name = "tsserver", diff --git a/lua/nvim-lsp-installer/servers/vimls/init.lua b/lua/nvim-lsp-installer/servers/vimls/init.lua index 6a86b9de..87679711 100644 --- a/lua/nvim-lsp-installer/servers/vimls/init.lua +++ b/lua/nvim-lsp-installer/servers/vimls/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("vim") +local root_dir = server.get_server_root_path "vim" return server.Server:new { name = "vimls", @@ -9,5 +9,5 @@ return server.Server:new { installer = npm.packages { "vim-language-server@latest" }, default_options = { cmd = { npm.executable(root_dir, "vim-language-server"), "--stdio" }, - } + }, } diff --git a/lua/nvim-lsp-installer/servers/vscode-langservers-extracted/init.lua b/lua/nvim-lsp-installer/servers/vscode-langservers-extracted/init.lua index 84286c3e..3609b40c 100644 --- a/lua/nvim-lsp-installer/servers/vscode-langservers-extracted/init.lua +++ b/lua/nvim-lsp-installer/servers/vscode-langservers-extracted/init.lua @@ -1,9 +1,9 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("vscode-langservers-extracted") +local root_dir = server.get_server_root_path "vscode-langservers-extracted" -return function (name, executable) +return function(name, executable) return server.Server:new { name = name, root_dir = root_dir, diff --git a/lua/nvim-lsp-installer/servers/vuels/init.lua b/lua/nvim-lsp-installer/servers/vuels/init.lua index 6e57685f..0ae9500b 100644 --- a/lua/nvim-lsp-installer/servers/vuels/init.lua +++ b/lua/nvim-lsp-installer/servers/vuels/init.lua @@ -1,13 +1,13 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("vuels") +local root_dir = server.get_server_root_path "vuels" return server.Server:new { name = "vuels", root_dir = root_dir, installer = npm.packages { "vls" }, default_options = { - cmd = { npm.executable(root_dir, "vls") , "--stdio" }, + cmd = { npm.executable(root_dir, "vls"), "--stdio" }, }, } diff --git a/lua/nvim-lsp-installer/servers/yamlls/init.lua b/lua/nvim-lsp-installer/servers/yamlls/init.lua index d0ad40ad..87ff4de4 100644 --- a/lua/nvim-lsp-installer/servers/yamlls/init.lua +++ b/lua/nvim-lsp-installer/servers/yamlls/init.lua @@ -1,7 +1,7 @@ -local server = require("nvim-lsp-installer.server") -local npm = require("nvim-lsp-installer.installers.npm") +local server = require "nvim-lsp-installer.server" +local npm = require "nvim-lsp-installer.installers.npm" -local root_dir = server.get_server_root_path("yaml") +local root_dir = server.get_server_root_path "yaml" return server.Server:new { name = "yamlls", @@ -9,5 +9,5 @@ return server.Server:new { installer = npm.packages { "yaml-language-server" }, default_options = { cmd = { npm.executable(root_dir, "yaml-language-server"), "--stdio" }, - } + }, } diff --git a/stylua.toml b/stylua.toml new file mode 100644 index 00000000..f307a39f --- /dev/null +++ b/stylua.toml @@ -0,0 +1,2 @@ +indent_type = "Spaces" +no_call_parentheses = true |