From f43cc8e20b8443f052c8bd1dd74066eec514587b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 17 Feb 2023 18:05:08 +0200
Subject: refactor(lsp)!: lua lsp renamed (#3836)

Need to run `:LvimCacheReset` after this for lua ftplugin regenration

* chore: bump plugins version

* refactor(loader): update lazy's cache setup

* chore: bump plugins version

* chore(lsp): skip antlerls for html

* fix(lsp): lua lsp renamed (#3841)

* fix(loader): lazy's cache is now a directory

* fix: LvimUpdate should bump core plugins (#3846)

* chore: bump plugins version

* fix(cmp): handle deprecated tree-sitter api (#3853)

* fix(loader): wrap cache invocation with pcall

avoid problems when lazy hasn't been updated yet

* chore(lsp): skip docker-compose ls

* chore: bump plugins

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: kylo252 <59826753+kylo252@users.noreply.github.com>
Co-authored-by: Jieru Mei <meijieru@gmail.com>
Co-authored-by: LostNeophyte <lostneophyte@tuta.io>
---
 lua/lvim/plugin-loader.lua | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'lua/lvim/plugin-loader.lua')

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)
-- 
cgit v1.2.3