fix: added check in lazy loader if module exists #2

folke · Oct 4, 2022 · 0044d37 · 0044d37
1 parent e362b85
commit 0044d37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lua/noice/hacks.lua b/lua/noice/hacks.lua
@@ -224,8 +224,8 @@ function M.fix_cmp()
     end
   end
 
-  local ok, api = pcall(require, "cmp.utils.api")
-  if not ok then
+  local api = require("cmp.utils.api")
+  if not api.lazy_exists() then
     -- cmp not availablle
     return
   end

diff --git a/lua/noice/util/lazy.lua b/lua/noice/util/lazy.lua
@@ -2,7 +2,11 @@ return function(module)
   -- if already loaded, return the module
   -- otherwise return a lazy module
   return type(package.loaded[module]) == "table" and package.loaded[module]
-    or setmetatable({}, {
+    or setmetatable({
+      lazy_exists = function()
+        return pcall(require, module) == true
+      end,
+    }, {
       __index = function(_, key)
         return require(module)[key]
       end,