From 5076ebbcbfd0e2164d91ff2073a6f21a561804df Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Sun, 12 Feb 2023 10:42:14 +0100 Subject: [PATCH] fix: sumneko_lua -> lua_ls --- README.md | 4 ++-- lua/neodev/lsp.lua | 11 ++++------- lua/neodev/{sumneko.lua => luals.lua} | 0 3 files changed, 6 insertions(+), 9 deletions(-) rename lua/neodev/{sumneko.lua => luals.lua} (100%) diff --git a/README.md b/README.md index 8cf1df39..1c363805 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ completion for the nvim lua API. - Automatically configures **lua-language-server** for your **Neovim** config, **Neovim** runtime and plugin directories -- [Annotations](https://github.com/sumneko/lua-language-server/wiki/Annotations) for completion, hover and signatures of: +- [Annotations](https://github.com/LuaLS/lua-language-server/wiki/Annotations) for completion, hover and signatures of: - Vim functions - Neovim api functions - `vim.opt` @@ -93,7 +93,7 @@ require("neodev").setup({ -- then setup your lsp server as usual local lspconfig = require('lspconfig') --- example to setup sumneko and enable call snippets +-- example to setup lua_ls and enable call snippets lspconfig.lua_ls.setup({ settings = { Lua = { diff --git a/lua/neodev/lsp.lua b/lua/neodev/lsp.lua index 4e7f5545..52148ef0 100644 --- a/lua/neodev/lsp.lua +++ b/lua/neodev/lsp.lua @@ -21,8 +21,8 @@ end function M.setup_jsonls(config) local schemas = config.settings.json and config.settings.json.schemas or {} table.insert(schemas, { - name = "Sumneko Lua Settings", - url = "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", + name = "LuaLS Settings", + url = "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json", fileMatch = { ".luarc.json", ".luarc.jsonc" }, }) config.settings = vim.tbl_deep_extend("force", config.settings, { @@ -78,11 +78,8 @@ function M.on_new_config(config, root_dir) or {} if opts.library.enabled then - config.settings = vim.tbl_deep_extend( - "force", - config.settings or {}, - require("neodev.sumneko").setup(opts, config.settings).settings - ) + config.settings = + vim.tbl_deep_extend("force", config.settings or {}, require("neodev.luals").setup(opts, config.settings).settings) for _, lib in ipairs(library) do table.insert(config.settings.Lua.workspace.library, lib) end diff --git a/lua/neodev/sumneko.lua b/lua/neodev/luals.lua similarity index 100% rename from lua/neodev/sumneko.lua rename to lua/neodev/luals.lua