diff options
| -rw-r--r-- | lua/lspconfig/configs.lua | 20 | ||||
| -rw-r--r-- | plugin/lspconfig.lua | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lua/lspconfig/configs.lua b/lua/lspconfig/configs.lua index a6ed2719..512c76b3 100644 --- a/lua/lspconfig/configs.lua +++ b/lua/lspconfig/configs.lua @@ -31,7 +31,7 @@ function configs.__newindex(t, config_name, config_def) default_config.name = config_name function M.setup(user_config) - local lsp_group = vim.api.nvim_create_augroup('lspconfig', { clear = false }) + local lsp_group = api.nvim_create_augroup('lspconfig', { clear = false }) validate { cmd = { @@ -70,7 +70,7 @@ function configs.__newindex(t, config_name, config_def) event = 'BufReadPost' pattern = '*' end - vim.api.nvim_create_autocmd(event, { + api.nvim_create_autocmd(event, { pattern = pattern, callback = function() M.manager.try_add() @@ -97,7 +97,7 @@ function configs.__newindex(t, config_name, config_def) end if root_dir then - vim.api.nvim_create_autocmd('BufReadPost', { + api.nvim_create_autocmd('BufReadPost', { pattern = vim.fn.fnameescape(root_dir) .. '/*', callback = function() M.manager.try_add_wrapper() @@ -109,7 +109,7 @@ function configs.__newindex(t, config_name, config_def) root_dir ), }) - for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do + for _, bufnr in ipairs(api.nvim_list_bufs()) do local bufname = api.nvim_buf_get_name(bufnr) if util.bufname_valid(bufname) then local buf_dir = util.path.sanitize(bufname) @@ -129,7 +129,7 @@ function configs.__newindex(t, config_name, config_def) end local pseudo_root = util.path.dirname(util.path.sanitize(bufname)) local client_id = M.manager.add(pseudo_root, true) - vim.lsp.buf_attach_client(vim.api.nvim_get_current_buf(), client_id) + lsp.buf_attach_client(api.nvim_get_current_buf(), client_id) end end @@ -194,8 +194,8 @@ function configs.__newindex(t, config_name, config_def) if bufnr == api.nvim_get_current_buf() then M._setup_buffer(client.id, bufnr) else - if vim.api.nvim_buf_is_valid(bufnr) then - vim.api.nvim_create_autocmd('BufEnter', { + if api.nvim_buf_is_valid(bufnr) then + api.nvim_create_autocmd('BufEnter', { callback = function() M._setup_buffer(client.id, bufnr) end, @@ -227,7 +227,7 @@ function configs.__newindex(t, config_name, config_def) function manager.try_add(bufnr) bufnr = bufnr or api.nvim_get_current_buf() - if vim.api.nvim_buf_get_option(bufnr, 'buftype') == 'nofile' then + if api.nvim_buf_get_option(bufnr, 'buftype') == 'nofile' then return end @@ -260,7 +260,7 @@ function configs.__newindex(t, config_name, config_def) -- `config.filetypes`, then do `manager.try_add(bufnr)`. function manager.try_add_wrapper(bufnr) bufnr = bufnr or api.nvim_get_current_buf() - local buf_filetype = vim.api.nvim_buf_get_option(bufnr, 'filetype') + local buf_filetype = api.nvim_buf_get_option(bufnr, 'filetype') if config.filetypes then for _, filetype in ipairs(config.filetypes) do if buf_filetype == filetype then @@ -277,7 +277,7 @@ function configs.__newindex(t, config_name, config_def) M.manager = manager M.make_config = make_config if reload and config.autostart ~= false then - for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do + for _, bufnr in ipairs(api.nvim_list_bufs()) do manager.try_add_wrapper(bufnr) end end diff --git a/plugin/lspconfig.lua b/plugin/lspconfig.lua index 48c73fd4..0877cbd7 100644 --- a/plugin/lspconfig.lua +++ b/plugin/lspconfig.lua @@ -1,4 +1,4 @@ -local api = vim.api +local api, lsp = vim.api, vim.lsp if vim.g.lspconfig ~= nil then return @@ -40,7 +40,7 @@ end local get_clients_from_cmd_args = function(arg) local result = {} for id in (arg or ''):gmatch '(%d+)' do - result[id] = vim.lsp.get_client_by_id(tonumber(id)) + result[id] = lsp.get_client_by_id(tonumber(id)) end if vim.tbl_isempty(result) then return require('lspconfig.util').get_managed_clients() @@ -104,7 +104,7 @@ api.nvim_create_user_command('LspStop', function(info) local server_name = string.len(info.args) > 0 and info.args or nil if not server_name then - local servers_on_buffer = vim.lsp.get_active_clients { buffer = current_buf } + local servers_on_buffer = lsp.get_active_clients { buffer = current_buf } for _, client in ipairs(servers_on_buffer) do local filetypes = client.config.filetypes if filetypes and vim.tbl_contains(filetypes, vim.bo[current_buf].filetype) then @@ -123,7 +123,7 @@ end, { }) api.nvim_create_user_command('LspLog', function() - vim.cmd(string.format('tabnew %s', vim.lsp.get_log_path())) + vim.cmd(string.format('tabnew %s', lsp.get_log_path())) end, { desc = 'Opens the Nvim LSP client log.', }) |