From 08f48049168aa1c7b04dbffa7afb319e3fa05827 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Sun, 27 Nov 2022 11:03:17 +0100 Subject: [PATCH] refactor: cleanup sections and fixed handlers in view --- lua/lazy/view/render.lua | 10 +++++----- lua/lazy/view/sections.lua | 40 ++++++++------------------------------ 2 files changed, 13 insertions(+), 37 deletions(-) diff --git a/lua/lazy/view/render.lua b/lua/lazy/view/render.lua index 89b44fe..79ddbc9 100644 --- a/lua/lazy/view/render.lua +++ b/lua/lazy/view/render.lua @@ -1,7 +1,7 @@ local Config = require("lazy.core.config") local Util = require("lazy.util") local Sections = require("lazy.view.sections") -local Loader = require("lazy.core.loader") +local Handler = require("lazy.core.handler") local Plugin = require("lazy.core.plugin") local Text = require("lazy.view.text") @@ -303,11 +303,11 @@ function M:details(plugin) table.insert(props, { "readme", "README.md" }) end - for _, loader in ipairs(Loader.types) do - if plugin[loader] then + for handler in ipairs(Handler.handlers) do + if plugin[handler] then table.insert(props, { - loader, - type(plugin[loader]) == "string" and plugin[loader] or table.concat(plugin[loader], ", "), + handler, + type(plugin[handler]) == "string" and plugin[handler] or table.concat(plugin[handler], ", "), "@string", }) end diff --git a/lua/lazy/view/sections.lua b/lua/lazy/view/sections.lua index e803fac..0b6035c 100644 --- a/lua/lazy/view/sections.lua +++ b/lua/lazy/view/sections.lua @@ -22,44 +22,13 @@ return { end, title = "Failed", }, - { - filter = function(plugin) - return has_task(plugin, function(task) - return task.running and task.type == "install" - end) - end, - title = "Installing", - }, - { - filter = function(plugin) - return has_task(plugin, function(task) - return task.running and task.type == "update" - end) - end, - title = "Updating", - }, - { - filter = function(plugin) - return has_task(plugin, function(task) - return task.running and task.type == "clean" - end) - end, - title = "Cleaning", - }, { filter = function(plugin) return has_task(plugin, function(task) return task.running end) end, - title = "Running", - }, - { - ---@param plugin LazyPlugin - filter = function(plugin) - return plugin.updated and plugin.updated.from ~= plugin.updated.to - end, - title = "Updated", + title = "Working", }, { filter = function(plugin) @@ -77,6 +46,13 @@ return { end, title = "Breaking Changes", }, + { + ---@param plugin LazyPlugin + filter = function(plugin) + return plugin.updated and plugin.updated.from ~= plugin.updated.to + end, + title = "Updated", + }, { filter = function(plugin) return has_task(plugin, function(task)