diff options
Diffstat (limited to 'nvim/lua')
| -rw-r--r-- | nvim/lua/config/lsp.lua | 56 | ||||
| -rw-r--r-- | nvim/lua/plugins/none-ls.lua | 20 |
2 files changed, 61 insertions, 15 deletions
diff --git a/nvim/lua/config/lsp.lua b/nvim/lua/config/lsp.lua index 6c30fc8..395e998 100644 --- a/nvim/lua/config/lsp.lua +++ b/nvim/lua/config/lsp.lua @@ -1,7 +1,55 @@ -vim.lsp.enable({"rust_analyzer", "nil_ls", "denols", "html", "cssls"}) +vim.lsp.enable({ "rust_analyzer", "nil_ls", "denols", "html", "cssls", "lua_ls" }) vim.lsp.config("*", { - onAttach = function(client, _) - client.server_capabilities.semanticTokensProvider = nil - end, + onAttach = function(client, _) + client.server_capabilities.semanticTokensProvider = nil + end, +}) + +-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#lua_ls +vim.lsp.config("lua_ls", { + on_init = function(client) + if client.workspace_folders then + local path = client.workspace_folders[1].name + if + path ~= vim.fn.stdpath("config") + and (vim.uv.fs_stat(path .. "/.luarc.json") or vim.uv.fs_stat(path .. "/.luarc.jsonc")) + then + return + end + end + + client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, { + runtime = { + -- Tell the language server which version of Lua you're using (most + -- likely LuaJIT in the case of Neovim) + version = "LuaJIT", + -- Tell the language server how to find Lua modules same way as Neovim + -- (see `:h lua-module-load`) + path = { + "lua/?.lua", + "lua/?/init.lua", + }, + }, + -- Make the server aware of Neovim runtime files + workspace = { + checkThirdParty = false, + library = { + vim.env.VIMRUNTIME, + -- Depending on the usage, you might want to add additional paths + -- here. + -- '${3rd}/luv/library', + -- '${3rd}/busted/library', + }, + -- Or pull in all of 'runtimepath'. + -- NOTE: this is a lot slower and will cause issues when working on + -- your own configuration. + -- See https://github.com/neovim/nvim-lspconfig/issues/3189 + -- library = vim.api.nvim_get_runtime_file('', true), + }, + }) + end, + settings = { + Lua = {}, + }, }) diff --git a/nvim/lua/plugins/none-ls.lua b/nvim/lua/plugins/none-ls.lua index fd28379..176c8f5 100644 --- a/nvim/lua/plugins/none-ls.lua +++ b/nvim/lua/plugins/none-ls.lua @@ -1,14 +1,12 @@ -- ripped from https://www.lazyvim.org/extras/lsp/none-ls return { - "nvimtools/none-ls.nvim", - opts = function(_, opts) - local nls = require("null-ls") - opts.root_dir = opts.root_dir - or require("null-ls.utils").root_pattern(".null-ls-root", ".neoconf.json", "Makefile", ".git") - opts.sources = vim.list_extend(opts.sources or {}, { - nls.builtins.formatting.stylua, - nls.builtins.formatting.alejandra, - nls.builtins.formatting.prettier, - }) - end, + "nvimtools/none-ls.nvim", + opts = function(_, opts) + local nls = require("null-ls") + opts.root_dir = opts.root_dir + or require("null-ls.utils").root_pattern(".null-ls-root", ".neoconf.json", "Makefile", ".git") + opts.sources = vim.list_extend(opts.sources or {}, { + nls.builtins.formatting.alejandra, + }) + end, } |
