Skip to content

Commit

Permalink
revert: "refactor!: make available_servers function private" #3589
Browse files Browse the repository at this point in the history
This reverts commit e118ce5.

It turns out `util.available_servers` is used more than anticipated, so
we revert the privatization for the time being.

Closes #3588
  • Loading branch information
dundargoc authored Jan 27, 2025
1 parent 637293c commit 1f941b3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lua/lspconfig/health.lua
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ local function check_lspconfig(bufnr)
bufnr = (bufnr and bufnr ~= -1) and bufnr or nil

health.start('LSP configs active in this session (globally)')
health.info('Configured servers: ' .. table.concat(util._available_servers(), ', '))
health.info('Configured servers: ' .. table.concat(util.available_servers(), ', '))
local deprecated_servers = {}
for server_name, deprecate in pairs(require('lspconfig').server_aliases()) do
table.insert(deprecated_servers, ('%s -> %s'):format(server_name, deprecate.to))
Expand Down
3 changes: 2 additions & 1 deletion lua/lspconfig/util.lua
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@ function M.get_managed_clients()
return clients
end

function M._available_servers()
--- @deprecated use `vim.lsp.config` in Nvim 0.11+ instead.
function M.available_servers()
local servers = {}
local configs = require 'lspconfig.configs'
for server, config in pairs(configs) do
Expand Down
2 changes: 1 addition & 1 deletion plugin/lspconfig.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end
local lsp_complete_configured_servers = function(arg)
return completion_sort(vim.tbl_filter(function(s)
return s:sub(1, #arg) == arg
end, util._available_servers()))
end, util.available_servers()))
end

local lsp_get_active_clients = function(arg)
Expand Down
2 changes: 1 addition & 1 deletion test/lspconfig_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ describe('lspconfig', function()
local _ = lspconfig.lua_ls
local _ = lspconfig.tsserver
lspconfig.rust_analyzer.setup {}
same({ 'rust_analyzer' }, require('lspconfig.util')._available_servers())
same({ 'rust_analyzer' }, require('lspconfig.util').available_servers())
end)

it('provides user_config to the on_setup hook', function()
Expand Down

0 comments on commit 1f941b3

Please sign in to comment.