diff options
| -rw-r--r-- | lua/lvim/lsp/config.lua | 2 | ||||
| -rw-r--r-- | lua/lvim/lsp/providers/lua_ls.lua (renamed from lua/lvim/lsp/providers/sumneko_lua.lua) | 2 | ||||
| -rw-r--r-- | lua/lvim/plugin-loader.lua | 27 | ||||
| -rw-r--r-- | snapshots/default.json | 56 | ||||
| -rw-r--r-- | tests/minimal_lsp.lua | 2 |
5 files changed, 46 insertions, 43 deletions
diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua index 7128a4cc..7f4b3bd5 100644 --- a/lua/lvim/lsp/config.lua +++ b/lua/lvim/lsp/config.lua @@ -1,10 +1,12 @@ local skipped_servers = { "angularls", "ansiblels", + "antlersls", "ccls", "csharp_ls", "cssmodules_ls", "denols", + "docker_compose_language_service", "ember", "emmet_ls", "eslint", diff --git a/lua/lvim/lsp/providers/sumneko_lua.lua b/lua/lvim/lsp/providers/lua_ls.lua index a73d3edc..2d3f4932 100644 --- a/lua/lvim/lsp/providers/sumneko_lua.lua +++ b/lua/lvim/lsp/providers/lua_ls.lua @@ -30,7 +30,7 @@ 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 + if server_name ~= "lua_ls" then return end local plugins = { "plenary.nvim", "telescope.nvim", "nvim-treesitter", "LuaSnip" } diff --git a/lua/lvim/plugin-loader.lua b/lua/lvim/plugin-loader.lua index 647fab9f..5a3a94de 100644 --- a/lua/lvim/plugin-loader.lua +++ b/lua/lvim/plugin-loader.lua @@ -17,7 +17,7 @@ function plugin_loader.init(opts) local core_plugins_dir = join_paths(get_lvim_base_dir(), "plugins") if utils.is_directory(core_plugins_dir) then vim.fn.mkdir(plugins_dir, "p") - vim.loop.fs_rmdir(plugins_dir) + vim.fn.delete(plugins_dir, "rf") require("lvim.utils").fs_copy(core_plugins_dir, plugins_dir) else vim.fn.system { @@ -47,21 +47,22 @@ function plugin_loader.init(opts) vim.opt.runtimepath:append(lazy_install_dir) vim.opt.runtimepath:append(join_paths(plugins_dir, "*")) - local lazy_cache = require "lazy.core.cache" - lazy_cache.setup { - performance = { - cache = { - enabled = true, - path = join_paths(get_cache_dir(), "lazy", "cache"), - }, - }, - } - -- HACK: Don't allow lazy to call setup second time - lazy_cache.setup = function() end + pcall(function() + -- set a custom path for lazy's cache and enable it + local lazy_cache = require "lazy.core.cache" + lazy_cache.path = join_paths(get_cache_dir(), "lazy", "luac") + lazy_cache.enable() + end) end function plugin_loader.reset_cache() - os.remove(require("lazy.core.cache").config.path) + -- TODO(kylo252): is this really necessary anymore? + local lazy_cache = require "lazy.core.cache" + local cache_path = lazy_cache.path + if utils.is_directory(cache_path) then + vim.fn.delete(cache_path, "rf") + vim.fn.mkdir(cache_path, "p") + end end function plugin_loader.reload(spec) diff --git a/snapshots/default.json b/snapshots/default.json index 7052ab33..c30c2ea4 100644 --- a/snapshots/default.json +++ b/snapshots/default.json @@ -1,24 +1,24 @@ { "Comment.nvim": { - "commit": "eab2c83" + "commit": "6821b3a" }, "LuaSnip": { - "commit": "d404ec3" + "commit": "58fbfc6" }, "alpha-nvim": { - "commit": "21a0f25" + "commit": "b3eef69" }, "bigfile.nvim": { "commit": "c1bad34" }, "bufferline.nvim": { - "commit": "c7492a7" + "commit": "84b0822" }, "cmp-buffer": { "commit": "3022dbc" }, "cmp-cmdline": { - "commit": "23c51b2" + "commit": "8fcc934" }, "cmp-nvim-lsp": { "commit": "0e6b2ed" @@ -30,70 +30,70 @@ "commit": "1809552" }, "friendly-snippets": { - "commit": "a6f7a16" + "commit": "1645e7c" }, "gitsigns.nvim": { - "commit": "ec4742a" + "commit": "f388995" }, "indent-blankline.nvim": { "commit": "8299fe7" }, "lazy.nvim": { - "commit": "9b20869" + "commit": "8186cc5" }, "lir.nvim": { - "commit": "3aa6c20" + "commit": "248f6b1" }, "lualine.nvim": { - "commit": "0050b30" + "commit": "e99d733" }, "lunar.nvim": { "commit": "29eedf7" }, "mason-lspconfig.nvim": { - "commit": "53f3a8b" + "commit": "93e58e1" }, "mason.nvim": { - "commit": "357ef66" + "commit": "d5ad4bb" }, "neodev.nvim": { - "commit": "b3b22cf" + "commit": "a81e749" }, "nlsp-settings.nvim": { - "commit": "d0b7caa" + "commit": "3f31cac" }, "null-ls.nvim": { - "commit": "60b4a71" + "commit": "a82aa08" }, "nvim-autopairs": { - "commit": "28f57e6" + "commit": "bde7a1b" }, "nvim-cmp": { - "commit": "cfafe0a" + "commit": "ea9eaff" }, "nvim-dap": { - "commit": "0e376f0" + "commit": "049eebe" }, "nvim-dap-ui": { - "commit": "6f18751" + "commit": "ffe3e58" }, "nvim-lspconfig": { - "commit": "d3c82d2" + "commit": "649137c" }, "nvim-navic": { "commit": "7e9d2b2" }, "nvim-tree.lua": { - "commit": "02fdc26" + "commit": "08a0aa1" }, "nvim-treesitter": { - "commit": "df6f322" + "commit": "be26661" }, "nvim-ts-context-commentstring": { "commit": "a0f8956" }, "nvim-web-devicons": { - "commit": "ade34ca" + "commit": "bb6d4fd" }, "onedarker.nvim": { "commit": "b00dd21" @@ -108,7 +108,7 @@ "commit": "685bc8e" }, "schemastore.nvim": { - "commit": "fd5ddd8" + "commit": "a4798a9" }, "structlog.nvim": { "commit": "45b26a2" @@ -120,15 +120,15 @@ "commit": "a1bd686" }, "toggleterm.nvim": { - "commit": "19aad0f" + "commit": "5576648" }, "tokyonight.nvim": { - "commit": "affb21a" + "commit": "a0abe53" }, "vim-illuminate": { - "commit": "d6ca7f7" + "commit": "49062ab" }, "which-key.nvim": { - "commit": "684e96c" + "commit": "5224c26" } } diff --git a/tests/minimal_lsp.lua b/tests/minimal_lsp.lua index 9515268f..dd4c666d 100644 --- a/tests/minimal_lsp.lua +++ b/tests/minimal_lsp.lua @@ -71,7 +71,7 @@ _G.load_config = function() end -- Add the server that troubles you here, e.g. "clangd", "pyright", "tsserver" - local name = "sumneko_lua" + local name = "lua_ls" local setup_opts = { on_attach = on_attach, |