aboutsummaryrefslogtreecommitdiffstats
path: root/lua
diff options
context:
space:
mode:
authorPeter Lithammer <peter.lithammer@gmail.com>2022-03-28 14:07:55 +0200
committerPeter Lithammer <peter.lithammer@gmail.com>2022-03-28 14:20:49 +0200
commit99a374b7655042fdbf82a61ab9923f8997be0c03 (patch)
tree50830d4feca0537c4d4f4621c57f4c18c3ac8f42 /lua
parentdocs: update server_configurations.md (diff)
downloadnvim-lspconfig-99a374b7655042fdbf82a61ab9923f8997be0c03.tar
nvim-lspconfig-99a374b7655042fdbf82a61ab9923f8997be0c03.tar.gz
nvim-lspconfig-99a374b7655042fdbf82a61ab9923f8997be0c03.tar.bz2
nvim-lspconfig-99a374b7655042fdbf82a61ab9923f8997be0c03.tar.lz
nvim-lspconfig-99a374b7655042fdbf82a61ab9923f8997be0c03.tar.xz
nvim-lspconfig-99a374b7655042fdbf82a61ab9923f8997be0c03.tar.zst
nvim-lspconfig-99a374b7655042fdbf82a61ab9923f8997be0c03.zip
ci: fix new luacheck v0.26.0 errors
See https://github.com/lunarmodules/luacheck/releases/tag/v0.26.0 lua/lspconfig/util.lua:225:40: used variable _make_config lua/lspconfig/configs.lua:207:63: used variable _root_dir lua/lspconfig/configs.lua:260:19: 'not (x == y)' can be replaced by 'x ~= y' (if neither side is a table or NaN)
Diffstat (limited to 'lua')
-rw-r--r--lua/lspconfig/configs.lua18
-rw-r--r--lua/lspconfig/util.lua4
2 files changed, 11 insertions, 11 deletions
diff --git a/lua/lspconfig/configs.lua b/lua/lspconfig/configs.lua
index 8dbef2aa..a47ecbae 100644
--- a/lua/lspconfig/configs.lua
+++ b/lua/lspconfig/configs.lua
@@ -136,7 +136,7 @@ function configs.__newindex(t, config_name, config_def)
M.manager = nil
end
- local make_config = function(_root_dir)
+ local make_config = function(root_dir)
local new_config = vim.tbl_deep_extend('keep', vim.empty_dict(), config)
new_config = vim.tbl_deep_extend('keep', new_config, default_config)
new_config.capabilities = new_config.capabilities or lsp.protocol.make_client_capabilities()
@@ -147,10 +147,10 @@ function configs.__newindex(t, config_name, config_def)
})
if config_def.on_new_config then
- pcall(config_def.on_new_config, new_config, _root_dir)
+ pcall(config_def.on_new_config, new_config, root_dir)
end
if config.on_new_config then
- pcall(config.on_new_config, new_config, _root_dir)
+ pcall(config.on_new_config, new_config, root_dir)
end
new_config.on_init = util.add_hook_after(new_config.on_init, function(client, result)
@@ -194,18 +194,18 @@ function configs.__newindex(t, config_name, config_def)
end
end)
- new_config.root_dir = _root_dir
+ new_config.root_dir = root_dir
new_config.workspace_folders = {
{
- uri = vim.uri_from_fname(_root_dir),
- name = string.format('%s', _root_dir),
+ uri = vim.uri_from_fname(root_dir),
+ name = string.format('%s', root_dir),
},
}
return new_config
end
- local manager = util.server_per_root_dir_manager(function(_root_dir)
- return make_config(_root_dir)
+ local manager = util.server_per_root_dir_manager(function(root_dir)
+ return make_config(root_dir)
end)
function manager.try_add(bufnr)
@@ -257,7 +257,7 @@ function configs.__newindex(t, config_name, config_def)
M.manager = manager
M.make_config = make_config
- if reload and not (config.autostart == false) then
+ if reload and config.autostart ~= false then
for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
manager.try_add_wrapper(bufnr)
end
diff --git a/lua/lspconfig/util.lua b/lua/lspconfig/util.lua
index 25ca1689..3febafc0 100644
--- a/lua/lspconfig/util.lua
+++ b/lua/lspconfig/util.lua
@@ -222,7 +222,7 @@ end)()
-- Returns a function(root_dir), which, when called with a root_dir it hasn't
-- seen before, will call make_config(root_dir) and start a new client.
-function M.server_per_root_dir_manager(_make_config)
+function M.server_per_root_dir_manager(make_config)
local clients = {}
local single_file_clients = {}
local manager = {}
@@ -242,7 +242,7 @@ function M.server_per_root_dir_manager(_make_config)
-- Check if we have a client already or start and store it.
if not client_id then
- local new_config = _make_config(root_dir)
+ local new_config = make_config(root_dir)
-- do nothing if the client is not enabled
if new_config.enabled == false then
return