Merge remote-tracking branch 'upstream/main' into feat/prioritize-cond

lua/lazy/view/float.lua

@@ -53,7 +53,7 @@ function M:init(opts)
   }
   self:mount()
   self:on_key(ViewConfig.keys.close, self.close)
-  self:on({ "BufDelete", "BufLeave", "BufHidden" }, self.close, { once = true })
+  self:on({ "BufDelete", "BufHidden" }, self.close, { once = true })
   return self
 end
 
@@ -107,9 +107,11 @@ function M:mount()
   local function opts()
     vim.bo[self.buf].bufhidden = "wipe"
     vim.wo[self.win].conceallevel = 3
+    vim.wo[self.win].foldenable = false
     vim.wo[self.win].spell = false
     vim.wo[self.win].wrap = true
     vim.wo[self.win].winhighlight = "Normal:LazyNormal"
+    vim.wo[self.win].colorcolumn = ""
   end
   opts()
 

lua/lazy/view/init.lua

@@ -77,7 +77,7 @@ function M.create()
 
   vim.keymap.set("n", ViewConfig.keys.abort, function()
     require("lazy.manage.process").abort()
-    return "<c-c>"
+    return ViewConfig.keys.abort
   end, { silent = true, buffer = self.buf, expr = true })
 
   -- plugin details

lua/lazy/view/render.lua

@@ -160,7 +160,7 @@ end
 function M:help()
   self:append("Help", "LazyH2"):nl():nl()
 
-  self:append("Use "):append("<C-c>", "LazySpecial"):append(" to abort all running tasks."):nl():nl()
+  self:append("Use "):append(ViewConfig.keys.abort, "LazySpecial"):append(" to abort all running tasks."):nl():nl()
 
   self:append("You can press "):append("<CR>", "LazySpecial"):append(" on a plugin to show its details."):nl():nl()
 
@@ -670,33 +670,19 @@ function M:debug()
   end)
   self:nl()
 
-  self:append("Cache.find()", "LazyH2"):nl()
-  self:props({
-    { "total", Cache.stats.find.total, "Number" },
-    { "time", self:ms(Cache.stats.find.time, 3), "Bold" },
-    { "avg time", self:ms(Cache.stats.find.time / Cache.stats.find.total, 3), "Bold" },
-    { "index", Cache.stats.find.index, "Number" },
-    { "fs_stat", Cache.stats.find.stat, "Number" },
-    { "not found", Cache.stats.find.not_found, "Number" },
-  }, { indent = 2 })
-  self:nl()
-
-  self:append("Cache.autoload()", "LazyH2"):nl()
-  self:props({
-    { "total", Cache.stats.autoload.total, "Number" },
-    { "time", self:ms(Cache.stats.autoload.time, 3), "Bold" },
-    { "avg time", self:ms(Cache.stats.autoload.time / Cache.stats.autoload.total, 3), "Bold" },
-  }, { indent = 2 })
-  self:nl()
-
-  self:append("Cache", "LazyH2"):nl()
-  local Cache = require("lazy.core.cache")
-  Util.foreach(Cache.cache, function(modname, entry)
-    local kb = math.floor(#entry.chunk / 10.24) / 100
-    self:append("● ", "LazySpecial", { indent = 2 }):append(modname):append(" " .. kb .. "Kb", "Bold")
-    if entry.modpath ~= modname then
-      self:append(" " .. vim.fn.fnamemodify(entry.modpath, ":p:~:."), "LazyComment")
+  Util.foreach(Cache.stats, function(name, stats)
+    self:append(name, "LazyH2"):nl()
+    local props = {
+      { "total", stats.total or 0, "Number" },
+      { "time", self:ms(stats.time or 0, 3), "Bold" },
+      { "avg time", self:ms((stats.time or 0) / (stats.total or 0), 3), "Bold" },
+    }
+    for k, v in pairs(stats) do
+      if k ~= "total" and k ~= "time" then
+        props[#props + 1] = { k, v, "Number" }
+      end
     end
+    self:props(props, { indent = 2 })
     self:nl()
   end)
 end