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

fix: rename sumneko_lua -> lua_ls #12

Merged
merged 1 commit into from
Feb 12, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions .neoconf.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
},
"neoconf": {
"plugins": {
"sumneko_lua": {
"lua_ls": {
"enabled": true
},
}
},
"lspconfig": {
"sumneko_lua": {
"lua_ls": {
"Lua.completion.callSnippet": "Replace",
},
}
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ require("neoconf").setup({
})

-- setup your lsp servers as usual
require("lspconfig").sumneko_lua.setup(...)
require("lspconfig").lua_ls.setup(...)
```

## ⚙️ Configuration
Expand Down Expand Up @@ -84,9 +84,9 @@ require("lspconfig").sumneko_lua.setup(...)
-- only show completion in json settings for configured lsp servers
configured_servers_only = true,
},
-- configures sumneko_lua to get completion of lspconfig server settings
sumneko_lua = {
-- by default, sumneko_lua annotations are only enabled in your neovim config directory
-- configures lua_ls to get completion of lspconfig server settings
lua_ls = {
-- by default, lua_ls annotations are only enabled in your neovim config directory
enabled_for_neovim_config = true,
-- explicitely enable adding annotations. Mostly relevant to put in your local .nvim.settings.json file
enabled = false,
Expand Down Expand Up @@ -269,7 +269,7 @@ local my_settings = Neoconf.get("neodev", defaults)
- [x] [sourcekit](https://github.com/swift-server/vscode-swift/tree/main/package.json)
- [x] [spectral](https://github.com/stoplightio/vscode-spectral/tree/master/package.json)
- [x] [stylelint_lsp](https://github.com/bmatcuk/coc-stylelintplus/tree/master/package.json)
- [x] [sumneko_lua](https://github.com/sumneko/vscode-lua/tree/master/package.json)
- [x] [lua_ls](https://github.com/LuaLS/vscode-lua/tree/master/package.json)
- [x] [svelte](https://github.com/sveltejs/language-tools/tree/master/packages/svelte-vscode/package.json)
- [x] [svlangserver](https://github.com/eirikpre/VSCode-SystemVerilog/tree/master/package.json)
- [x] [tailwindcss](https://github.com/tailwindlabs/tailwindcss-intellisense/tree/master/packages/vscode-tailwindcss/package.json)
Expand Down
10 changes: 5 additions & 5 deletions doc/neoconf.nvim.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ It’s important that you set up `neoconf.nvim` **BEFORE** `nvim-lspconfig`.
})

-- setup your lsp servers as usual
require("lspconfig").sumneko_lua.setup(...)
require("lspconfig").lua_ls.setup(...)
<


Expand Down Expand Up @@ -111,9 +111,9 @@ CONFIGURATION *neoconf.nvim-configuration*
-- only show completion in json settings for configured lsp servers
configured_servers_only = true,
},
-- configures sumneko_lua to get completion of lspconfig server settings
sumneko_lua = {
-- by default, sumneko_lua annotations are only enabled in your neovim config directory
-- configures lua_ls to get completion of lspconfig server settings
lua_ls = {
-- by default, lua_ls annotations are only enabled in your neovim config directory
enabled_for_neovim_config = true,
-- explicitely enable adding annotations. Mostly relevant to put in your local .nvim.settings.json file
enabled = false,
Expand Down Expand Up @@ -308,7 +308,7 @@ SUPPORTED LANGUAGE SERVERS *neoconf.nvim-supported-language-servers*
- sourcekit <https://github.com/swift-server/vscode-swift/tree/main/package.json>
- spectral <https://github.com/stoplightio/vscode-spectral/tree/master/package.json>
- stylelint_lsp <https://github.com/bmatcuk/coc-stylelintplus/tree/master/package.json>
- sumneko_lua <https://github.com/sumneko/vscode-lua/tree/master/package.json>
- lua_ls <https://github.com/sumneko/vscode-lua/tree/master/package.json>
- svelte <https://github.com/sveltejs/language-tools/tree/master/packages/svelte-vscode/package.json>
- svlangserver <https://github.com/eirikpre/VSCode-SystemVerilog/tree/master/package.json>
- tailwindcss <https://github.com/tailwindlabs/tailwindcss-intellisense/tree/master/packages/vscode-tailwindcss/package.json>
Expand Down
2 changes: 1 addition & 1 deletion lua/neoconf/build/schemas.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ local M = {}

--- @type table<string, LspSchema>
M.overrides = {
sumneko_lua = {
lua_ls = {
translate = true,
},
jsonls = {
Expand Down
6 changes: 3 additions & 3 deletions lua/neoconf/config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ M.defaults = {
-- only show completion in json settings for configured lsp servers
configured_servers_only = true,
},
-- configures sumneko_lua to get completion of lspconfig server settings
sumneko_lua = {
-- by default, sumneko_lua annotations are only enabled in your neovim config directory
-- configures lua_ls to get completion of lspconfig server settings
lua_ls = {
-- by default, lua_ls annotations are only enabled in your neovim config directory
enabled_for_neovim_config = true,
-- explicitely enable adding annotations. Mostly relevant to put in your local .nvim.settings.json file
enabled = false,
Expand Down
6 changes: 3 additions & 3 deletions lua/neoconf/health.lua
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ function M.check()
else
warn("**lspconfig jsonls** is not installed? You won't get any auto completion in your settings files")
end
if vim.tbl_contains(available, "sumneko_lua") then
ok("**lspconfig sumneko_lua** is installed")
if vim.tbl_contains(available, "lua_ls") then
ok("**lspconfig lua_ls** is installed")
else
warn("**lspconfig sumneko_lua** is not installed? You won't get any auto completion in your lua settings files")
warn("**lspconfig lua_ls** is not installed? You won't get any auto completion in your lua settings files")
end
else
error("**lspconfig** not installed?")
Expand Down
6 changes: 3 additions & 3 deletions lua/neoconf/plugins/sumneko.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ function M.setup()
end

function M.on_new_config(config, root_dir)
if config.name == "sumneko_lua" then
if config.name == "lua_ls" then
local settings = Config.get({ file = root_dir })

local enabled = settings.plugins.sumneko_lua.enabled
if not enabled and settings.plugins.sumneko_lua.enabled_for_neovim_config then
local enabled = settings.plugins.lua_ls.enabled
if not enabled and settings.plugins.lua_ls.enabled_for_neovim_config then
enabled = Util.is_nvim_config(root_dir)
end

Expand Down
4 changes: 2 additions & 2 deletions schemas/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"sourcekit": "https://raw.githubusercontent.com/swift-server/vscode-swift/main/package.json",
"spectral": "https://raw.githubusercontent.com/stoplightio/vscode-spectral/master/package.json",
"stylelint_lsp": "https://raw.githubusercontent.com/bmatcuk/coc-stylelintplus/master/package.json",
"sumneko_lua": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/package.json",
"lua_ls": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/package.json",
"svelte": "https://raw.githubusercontent.com/sveltejs/language-tools/master/packages/svelte-vscode/package.json",
"svlangserver": "https://raw.githubusercontent.com/eirikpre/VSCode-SystemVerilog/master/package.json",
"tailwindcss": "https://raw.githubusercontent.com/tailwindlabs/tailwindcss-intellisense/master/packages/vscode-tailwindcss/package.json",
Expand All @@ -60,4 +60,4 @@
"yamlls": "https://raw.githubusercontent.com/redhat-developer/vscode-yaml/master/package.json",
"zeta_note": "https://raw.githubusercontent.com/artempyanykh/zeta-note-vscode/main/package.json",
"zls": "https://raw.githubusercontent.com/zigtools/zls-vscode/master/package.json"
}
}
Loading