From 8e968606f9c93b91f347396c7c89a3cf4e02ef8c Mon Sep 17 00:00:00 2001 From: Zeioth Date: Wed, 7 May 2025 19:37:30 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9Bfix(`mason=20v2.0`):=20Compatib?= =?UTF-8?q?ility=20added?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/java/utils/mason.lua | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/lua/java/utils/mason.lua b/lua/java/utils/mason.lua index 6e239a2..0e252e6 100644 --- a/lua/java/utils/mason.lua +++ b/lua/java/utils/mason.lua @@ -6,42 +6,29 @@ local await = async.wait_handle_ok local M = {} function M.is_available(package_name, package_version) + -- guard clause local has_pkg = mason_reg.has_package(package_name) + if not has_pkg then return false end - if not has_pkg then - return false - end - - local has_version = false - + -- check local pkg = mason_reg.get_package(package_name) - pkg:get_installed_version(function(success, version) - if success and version == package_version then - has_version = true - end - end) + local version = pkg:get_installed_version() + local has_version = version == package_version return has_version end function M.is_installed(package_name, package_version) + -- guard clause local pkg = mason_reg.get_package(package_name) local is_installed = pkg:is_installed() + if not is_installed then return false end - if not is_installed then - return false - end - - local installed_version - pkg:get_installed_version(function(ok, version) - if not ok then - return - end - - installed_version = version - end) + -- check + local installed_version = pkg:get_installed_version() + is_installed = installed_version == package_version - return installed_version == package_version + return is_installed end function M.is_outdated(packages) From 2662be0ab5d3b1c1b0807a7b3fa4fbc7abf4ecb0 Mon Sep 17 00:00:00 2001 From: Zeioth Date: Wed, 7 May 2025 19:42:35 +0200 Subject: [PATCH 2/2] format: stylua --- lua/java/utils/mason.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lua/java/utils/mason.lua b/lua/java/utils/mason.lua index 0e252e6..74ffdec 100644 --- a/lua/java/utils/mason.lua +++ b/lua/java/utils/mason.lua @@ -8,12 +8,14 @@ local M = {} function M.is_available(package_name, package_version) -- guard clause local has_pkg = mason_reg.has_package(package_name) - if not has_pkg then return false end + if not has_pkg then + return false + end -- check local pkg = mason_reg.get_package(package_name) local version = pkg:get_installed_version() - local has_version = version == package_version + local has_version = version == package_version return has_version end @@ -22,7 +24,9 @@ function M.is_installed(package_name, package_version) -- guard clause local pkg = mason_reg.get_package(package_name) local is_installed = pkg:is_installed() - if not is_installed then return false end + if not is_installed then + return false + end -- check local installed_version = pkg:get_installed_version()