Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: rename sumneko_lua -> lua_ls #2439

Merged
merged 5 commits into from
Feb 12, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions lua/lspconfig.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,26 @@ function M.available_servers()
return M.util.available_servers()
end

---@class Alias
---@field to string The new name of the server
---@field version string The version that the alias will be removed in
---@type table<string, Alias>
local server_aliases = {
figsoda marked this conversation as resolved.
Show resolved Hide resolved
sumneko_lua = {
to = 'lua_language_server',
version = '0.2.0',
},
}

local mt = {}
function mt:__index(k)
if configs[k] == nil then
local alias = server_aliases[k]
if alias then
vim.deprecate(k, alias.to, alias.version, 'lspconfig')
k = alias.to
end

local success, config = pcall(require, 'lspconfig.server_configurations.' .. k)
if success then
configs[k] = config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ return {
},
docs = {
description = [[
https://github.com/sumneko/lua-language-server
https://github.com/luals/lua-language-server

Lua language server.

`lua-language-server` can be installed by following the instructions [here](https://github.com/sumneko/lua-language-server/wiki/Getting-Started#command-line).
`lua-language-server` can be installed by following the instructions [here](https://github.com/luals/lua-language-server/wiki/Getting-Started#command-line).

The default `cmd` assumes that the `lua-language-server` binary can be found in `$PATH`.

Expand All @@ -55,7 +55,7 @@ initial requests (completion, location) upon starting as well as time to first d
Completion results will include a workspace indexing progress message until the server has finished indexing.

```lua
require'lspconfig'.sumneko_lua.setup {
require'lspconfig'.lua_language_server.setup {
settings = {
Lua = {
runtime = {
Expand All @@ -79,9 +79,9 @@ require'lspconfig'.sumneko_lua.setup {
}
```

See `lua-language-server`'s [documentation](https://github.com/sumneko/lua-language-server/blob/master/locale/en-us/setting.lua) for an explanation of the above fields:
* [Lua.runtime.path](https://github.com/sumneko/lua-language-server/blob/076dd3e5c4e03f9cef0c5757dfa09a010c0ec6bf/locale/en-us/setting.lua#L5-L13)
* [Lua.workspace.library](https://github.com/sumneko/lua-language-server/blob/076dd3e5c4e03f9cef0c5757dfa09a010c0ec6bf/locale/en-us/setting.lua#L77-L78)
See `lua-language-server`'s [documentation](https://github.com/luals/lua-language-server/blob/master/locale/en-us/setting.lua) for an explanation of the above fields:
* [Lua.runtime.path](https://github.com/luals/lua-language-server/blob/076dd3e5c4e03f9cef0c5757dfa09a010c0ec6bf/locale/en-us/setting.lua#L5-L13)
* [Lua.workspace.library](https://github.com/luals/lua-language-server/blob/076dd3e5c4e03f9cef0c5757dfa09a010c0ec6bf/locale/en-us/setting.lua#L77-L78)

]],
default_config = {
Expand Down
2 changes: 1 addition & 1 deletion test/lspconfig_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ describe('lspconfig', function()
exec_lua [[
local lspconfig = require("lspconfig")
local actual = nil
local _ = lspconfig.sumneko_lua
local _ = lspconfig.lua_language_server
local _ = lspconfig.tsserver
lspconfig.rust_analyzer.setup {}
return require("lspconfig.util").available_servers()
Expand Down
2 changes: 1 addition & 1 deletion test/minimal_init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ end

-- Add the server that troubles you here
local name = 'pyright'
local cmd = { 'pyright-langserver', '--stdio' } -- needed for elixirls, omnisharp, sumneko_lua
local cmd = { 'pyright-langserver', '--stdio' } -- needed for elixirls, lua_language_server, omnisharp
if not name then
print 'You have not defined a server name, please edit minimal_init.lua'
end
Expand Down