From 99ee28473962d9ab8aa11db2d2cc201e38f0f432 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 11 Oct 2023 14:25:10 +0200
Subject: [PATCH] fix(ui): use actual handler values for rendering plugin
 handlers

---
 lua/lazy/core/handler/ft.lua | 13 ++++++++-----
 lua/lazy/view/render.lua     | 25 ++++++++++++++-----------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/lua/lazy/core/handler/ft.lua b/lua/lazy/core/handler/ft.lua
index f0947c6..7af2b9a 100644
--- a/lua/lazy/core/handler/ft.lua
+++ b/lua/lazy/core/handler/ft.lua
@@ -5,11 +5,6 @@ local Loader = require("lazy.core.loader")
 local M = {}
 M.extends = Event
 
----@param value string
-function M:_event(value)
-  return "FileType " .. value
-end
-
 ---@param plugin LazyPlugin
 function M:add(plugin)
   self.super.add(self, plugin)
@@ -18,4 +13,12 @@ function M:add(plugin)
   end
 end
 
+function M:parse(value)
+  return {
+    id = value,
+    event = "FileType",
+    pattern = value,
+  }
+end
+
 return M
diff --git a/lua/lazy/view/render.lua b/lua/lazy/view/render.lua
index 12c3da3..d4cfdfb 100644
--- a/lua/lazy/view/render.lua
+++ b/lua/lazy/view/render.lua
@@ -319,17 +319,13 @@ function M:reason(reason, opts)
   end
   for _, key in ipairs(keys) do
     local value = reason[key]
-    if type(key) == "number" then
-    -- elseif key == "require" then
-    elseif key ~= "time" then
+    local skip = type(key) == "number" or key == "time"
+    if not skip then
       if first then
         first = false
       else
         self:append(" ")
       end
-      if key == "event" then
-        value = value:match("User (.*)") or value
-      end
       if key == "keys" then
         value = type(value) == "string" and value or value.lhs or value[1]
       end
@@ -414,11 +410,18 @@ function M:plugin(plugin)
     if plugin._.kind ~= "disabled" then
       for handler in pairs(Handler.types) do
         if plugin[handler] then
-          local trigger = {}
-          for _, value in ipairs(plugin[handler]) do
-            table.insert(trigger, type(value) == "table" and value[1] or value)
-          end
-          reason[handler] = table.concat(trigger, " ")
+          local values = Handler.handlers[handler]:values(plugin)
+          values = vim.tbl_map(function(value)
+            if handler == "ft" or handler == "event" then
+              ---@cast value LazyEvent
+              return value.id
+            elseif handler == "keys" then
+              ---@cast value LazyKeys
+              return value.lhs .. (value.mode == "n" and "" or " (" .. value.mode .. ")")
+            end
+            return value
+          end, vim.tbl_values(values))
+          reason[handler] = table.concat(values, " ")
         end
       end
     end