From 68fdbaa51d658899d4405b2660bfbe360e9dfed4 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Mon, 19 Sep 2022 13:10:07 +0200 Subject: fix(lsp): enforce lvim completion for lua-server (#3035) --- lua/lvim/lsp/providers/sumneko_lua.lua | 55 +++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 17 deletions(-) (limited to 'lua/lvim/lsp/providers/sumneko_lua.lua') diff --git a/lua/lvim/lsp/providers/sumneko_lua.lua b/lua/lvim/lsp/providers/sumneko_lua.lua index 6cd78157..ef159e1c 100644 --- a/lua/lvim/lsp/providers/sumneko_lua.lua +++ b/lua/lvim/lsp/providers/sumneko_lua.lua @@ -1,32 +1,53 @@ -local dev_opts = { +local default_workspace = { library = { - vimruntime = true, -- runtime path - types = true, -- full signature, docs and completion of vim.api, vim.treesitter, vim.lsp and others - -- plugins = true, -- installed opt or start plugins in packpath - -- you can also specify the list of plugins to make available as a workspace library - plugins = { "plenary.nvim" }, + vim.fn.expand "$VIMRUNTIME", + get_lvim_base_dir(), + require("lua-dev.sumneko").types(), }, - override = nil, -- function(root_dir, options) end, + + maxPreload = 1000, + preloadFileSize = 10000, } -local lua_dev_loaded, lua_dev = pcall(require, "lua-dev") -if lua_dev_loaded then - lua_dev.setup(dev_opts) +local add_packages_to_workspace = function(packages, config) + -- config.settings.Lua = config.settings.Lua or { workspace = default_workspace } + local runtimedirs = vim.api.nvim__get_runtime({ "lua" }, true, { is_lua = true }) + local workspace = config.settings.Lua.workspace + for _, v in pairs(runtimedirs) do + for _, pack in ipairs(packages) do + if v:match(pack) and not vim.tbl_contains(workspace.library, v) then + table.insert(workspace.library, v) + end + end + end end +local lspconfig = require "lspconfig" + +local make_on_new_config = function(on_new_config, _) + return lspconfig.util.add_hook_before(on_new_config, function(new_config, _) + local server_name = new_config.name + + if server_name ~= "sumneko_lua" then + return + end + local plugins = { "plenary.nvim", "telescope.nvim", "nvim-treesitter", "LuaSnip" } + add_packages_to_workspace(plugins, new_config) + end) +end + +lspconfig.util.default_config = vim.tbl_extend("force", lspconfig.util.default_config, { + on_new_config = make_on_new_config(lspconfig.util.default_config.on_new_config), +}) + local opts = { settings = { Lua = { + telemetry = { enable = false }, diagnostics = { globals = { "vim", "lvim", "packer_plugins" }, }, - workspace = { - library = { - [require("lvim.utils").join_paths(get_runtime_dir(), "lvim", "lua")] = true, - }, - maxPreload = 100000, - preloadFileSize = 10000, - }, + workspace = default_workspace, }, }, } -- cgit v1.2.3 From 1c03ac80529d90c7a824a581172b6e41e6ae237b Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Mon, 3 Oct 2022 00:56:23 +0000 Subject: feat: reload and lir color update (#3123) --- lua/lvim/lsp/providers/sumneko_lua.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lua/lvim/lsp/providers/sumneko_lua.lua') diff --git a/lua/lvim/lsp/providers/sumneko_lua.lua b/lua/lvim/lsp/providers/sumneko_lua.lua index ef159e1c..948f1fd9 100644 --- a/lua/lvim/lsp/providers/sumneko_lua.lua +++ b/lua/lvim/lsp/providers/sumneko_lua.lua @@ -44,8 +44,14 @@ local opts = { settings = { Lua = { telemetry = { enable = false }, + runtime = { + version = "LuaJIT", + special = { + reload = "require", + }, + }, diagnostics = { - globals = { "vim", "lvim", "packer_plugins" }, + globals = { "vim", "lvim", "packer_plugins", "reload" }, }, workspace = default_workspace, }, -- cgit v1.2.3 From 91dadd46a9d3c93b936ae79912e28d250f883e60 Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Wed, 12 Oct 2022 16:16:53 +0330 Subject: fix(lua-dev): make sure we are loading the correct types (#3208) --- lua/lvim/lsp/providers/sumneko_lua.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lua/lvim/lsp/providers/sumneko_lua.lua') diff --git a/lua/lvim/lsp/providers/sumneko_lua.lua b/lua/lvim/lsp/providers/sumneko_lua.lua index 948f1fd9..466c9151 100644 --- a/lua/lvim/lsp/providers/sumneko_lua.lua +++ b/lua/lvim/lsp/providers/sumneko_lua.lua @@ -2,10 +2,10 @@ local default_workspace = { library = { vim.fn.expand "$VIMRUNTIME", get_lvim_base_dir(), - require("lua-dev.sumneko").types(), + require("lua-dev.config").types(), }, - maxPreload = 1000, + maxPreload = 5000, preloadFileSize = 10000, } -- cgit v1.2.3 From 91ac8a0bb0eefc31815371454bcf59aa72d0acc3 Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Sat, 15 Oct 2022 10:21:24 +0330 Subject: fix(luadev): this plugin has been renamed (#3235) --- lua/lvim/lsp/providers/sumneko_lua.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/lvim/lsp/providers/sumneko_lua.lua') diff --git a/lua/lvim/lsp/providers/sumneko_lua.lua b/lua/lvim/lsp/providers/sumneko_lua.lua index 466c9151..2caa23b6 100644 --- a/lua/lvim/lsp/providers/sumneko_lua.lua +++ b/lua/lvim/lsp/providers/sumneko_lua.lua @@ -2,7 +2,7 @@ local default_workspace = { library = { vim.fn.expand "$VIMRUNTIME", get_lvim_base_dir(), - require("lua-dev.config").types(), + require("neodev.config").types(), }, maxPreload = 5000, -- cgit v1.2.3