From a18c031c72a3c7576ba5dc60ee30de8290c8757c Mon Sep 17 00:00:00 2001
From: William Boman <william@redwill.se>
Date: Mon, 29 May 2023 17:21:30 +0200
Subject: fix(ui): improve search mode UI and remove redundant whitespaces
 (#1332)

---
 lua/mason/ui/components/main/package_list.lua | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'lua')

diff --git a/lua/mason/ui/components/main/package_list.lua b/lua/mason/ui/components/main/package_list.lua
index 5066b2de..dc8b7428 100644
--- a/lua/mason/ui/components/main/package_list.lua
+++ b/lua/mason/ui/components/main/package_list.lua
@@ -125,17 +125,21 @@ local function PackageComponent(state, pkg, opts)
     local is_expanded = state.packages.expanded == pkg.name
     local label = (is_expanded or pkg_state.has_transitioned) and p.Bold(" " .. pkg.name) or p.none(" " .. pkg.name)
 
+    local package_line = {
+        opts.icon,
+        label,
+    }
+
+    local pkg_aliases = pkg:get_aliases()
+    if #pkg_aliases > 0 then
+        package_line[#package_line + 1] = p.Comment(" " .. table.concat(pkg:get_aliases(), ", "))
+    end
+    if state.view.is_searching then
+        package_line[#package_line + 1] = p.Comment((" (keywords: %s)"):format(get_package_search_keywords(pkg)))
+    end
+
     return Ui.Node {
-        Ui.HlTextNode {
-            {
-                opts.icon,
-                label,
-                p.none " ",
-                p.Comment(table.concat(pkg:get_aliases(), ", ")),
-                state.view.is_searching and p.Comment(" // keywords: " .. get_package_search_keywords(pkg))
-                    or p.none "",
-            },
-        },
+        Ui.HlTextNode { package_line },
         opts.sticky or Ui.Node {},
         Ui.When(pkg_state.is_checking_new_version, function()
             return Ui.VirtualTextNode { p.Comment " checking for new version…" }
-- 
cgit v1.3.1