chore: adjust some remnants of nvim-lsp-installer

3 files changed, 12 insertions, 16 deletions

diff --git a/lua/mason/settings.lua b/lua/mason/settings.lua
index bfa7fd9f..df3585e8 100644
--- a/lua/mason/settings.lua
+++ b/lua/mason/settings.lua
@@ -51,11 +51,11 @@ local DEFAULT_SETTINGS = {
     },
 
     -- Controls to which degree logs are written to the log file. It's useful to set this to vim.log.levels.DEBUG when
-    -- debugging issues with server installations.
+    -- debugging issues with package installations.
     log_level = vim.log.levels.INFO,
 
-    -- Limit for the maximum amount of servers to be installed at the same time. Once this limit is reached, any further
-    -- servers that are requested to be installed will be put in a queue.
+    -- Limit for the maximum amount of packages to be installed at the same time. Once this limit is reached, any further
+    -- packages that are requested to be installed will be put in a queue.
     max_concurrent_installers = 4,
 
     github = {
diff --git a/lua/mason/ui/components/main/package_list.lua b/lua/mason/ui/components/main/package_list.lua
index 49f82c5a..696b838f 100644
--- a/lua/mason/ui/components/main/package_list.lua
+++ b/lua/mason/ui/components/main/package_list.lua
@@ -176,7 +176,7 @@ local function Installed(state)
                     keybinds = {
                         Ui.Keybind(settings.current.ui.keymaps.update_package, "INSTALL_PACKAGE", package),
                         Ui.Keybind(settings.current.ui.keymaps.uninstall_package, "UNINSTALL_PACKAGE", package),
-                        Ui.Keybind(settings.current.ui.keymaps.toggle_package_expand, "TOGGLE_EXPAND_SERVER", package),
+                        Ui.Keybind(settings.current.ui.keymaps.toggle_package_expand, "TOGGLE_EXPAND_PACKAGE", package),
                     },
                 })
             end,
@@ -253,7 +253,7 @@ local function Failed(state)
                 icon = p.error(settings.current.ui.icons.package_pending),
                 keybinds = {
                     Ui.Keybind(settings.current.ui.keymaps.install_package, "INSTALL_PACKAGE", package),
-                    Ui.Keybind(settings.current.ui.keymaps.toggle_package_expand, "TOGGLE_EXPAND_SERVER", package),
+                    Ui.Keybind(settings.current.ui.keymaps.toggle_package_expand, "TOGGLE_EXPAND_PACKAGE", package),
                 },
             })
         end,
@@ -272,7 +272,7 @@ local function Uninstalled(state)
                 icon = p.muted(settings.current.ui.icons.package_uninstalled),
                 keybinds = {
                     Ui.Keybind(settings.current.ui.keymaps.install_package, "INSTALL_PACKAGE", package),
-                    Ui.Keybind(settings.current.ui.keymaps.toggle_package_expand, "TOGGLE_EXPAND_SERVER", package),
+                    Ui.Keybind(settings.current.ui.keymaps.toggle_package_expand, "TOGGLE_EXPAND_PACKAGE", package),
                 },
             })
         end,
diff --git a/lua/mason/ui/instance.lua b/lua/mason/ui/instance.lua
index d01a8782..a6db4d25 100644
--- a/lua/mason/ui/instance.lua
+++ b/lua/mason/ui/instance.lua
@@ -182,10 +182,8 @@ local function mutate_package_visibility(mutate_fn)
             _.T
         )
         for __, package in ipairs(packages) do
-            state.packages.visible[package.name] = _.all_pass(
-                { view_predicate[state.view.current], language_predicate },
-                package.spec
-            )
+            state.packages.visible[package.name] =
+                _.all_pass({ view_predicate[state.view.current], language_predicate }, package.spec)
         end
     end)
 end
@@ -203,10 +201,8 @@ local function setup_handle(handle)
 
     local function handle_spawninfo_change()
         mutate_state(function(state)
-            state.packages.states[handle.package.name].latest_spawn = handle
-                :peek_spawninfo_stack()
-                :map(tostring)
-                :or_else(nil)
+            state.packages.states[handle.package.name].latest_spawn =
+                handle:peek_spawninfo_stack():map(tostring):or_else(nil)
         end)
     end
 
@@ -430,7 +426,7 @@ local function dequeue_package(event)
     )
 end
 
-local function toggle_expand_server(event)
+local function toggle_expand_package(event)
     ---@type Package
     local package = event.payload
     mutate_state(function(state)
@@ -562,7 +558,7 @@ local effects = {
     ["SET_VIEW"] = set_view,
     ["TERMINATE_PACKAGE_HANDLE"] = terminate_package_handle,
     ["TOGGLE_EXPAND_CURRENT_SETTINGS"] = toggle_expand_current_settings,
-    ["TOGGLE_EXPAND_SERVER"] = toggle_expand_server,
+    ["TOGGLE_EXPAND_PACKAGE"] = toggle_expand_package,
     ["TOGGLE_HELP"] = toggle_help,
     ["TOGGLE_JSON_SCHEMA"] = toggle_json_schema,
     ["TOGGLE_JSON_SCHEMA_KEY"] = toggle_json_schema_keys,