refactor: get plugin artifacts from mason shared directory (#13)

Author: s1n7ax

.gitignore

@@ -1 +1,2 @@
 vendor/plenary.nvim
+.test_plugins

lua/java/server.lua

@@ -15,8 +15,8 @@ local M = {}
 
 ---@alias JDTLSPluginPaths JDTLSPluginPathRecord[]
 M.plugins = {
-	{ name = 'java-test', path = '/server/*.jar' },
-	{ name = 'java-debug-adapter', path = '/extension/server/*.jar' },
+	{ name = 'java-test', path = '/*.jar' },
+	{ name = 'java-debug-adapter', path = '/*.jar' },
 }
 
 ---Returns a configuration for jdtls that you can pass into the setup of nvim-lspconfig

lua/java/utils/mason.lua

@@ -1,17 +1,26 @@
+local mason_registry = require('mason-registry')
+
 local M = {}
 
 ---Returns the path to the package in mason packages
 ---@param pkg_name string
 ---@return string | nil
 function M.get_pkg_path(pkg_name)
-	return require('mason-registry').get_package(pkg_name):get_install_path()
+	return mason_registry.get_package(pkg_name):get_install_path()
 end
 
 ---Returns true if the package in installed in mason
 ---@param pkg_name string
 ---@return boolean
 function M.is_pkg_installed(pkg_name)
-	return require('mason-registry').get_package(pkg_name):is_installed()
+	return mason_registry.get_package(pkg_name):is_installed()
+end
+
+---Returns the shared artifact path for a given package
+---@param pkg_name string name of the package to get the path of
+---@return string
+function M.get_shared_path(pkg_name)
+	return vim.fn.glob('$MASON/share/' .. pkg_name)
 end
 
 return M

lua/java/utils/plugin.lua

@@ -13,7 +13,7 @@ function M.get_plugin_jars(pkg_name, path_to_jars)
 		return {}
 	end
 
-	local path = mason.get_pkg_path(pkg_name)
+	local path = mason.get_shared_path(pkg_name)
 
 	log.fmt_info('looking for %s plugin files at %s', pkg_name, path)
 

tests/prepare_config.lua

@@ -13,7 +13,7 @@ end
 
 vim.opt.rtp:prepend(lazypath)
 
-local temp_path = '/tmp/nvim-java-test-plugins'
+local temp_path = './.test_plugins'
 
 require('lazy').setup({
 	{
@@ -24,6 +24,10 @@ require('lazy').setup({
 		'nvim-lua/plenary.nvim',
 		lazy = false,
 	},
+	{
+		'williamboman/mason.nvim',
+		lazy = false,
+	},
 }, {
 	root = temp_path,
 	lockfile = temp_path .. '/lazy-lock.json',

tests/test_config.lua

@@ -1,4 +1,5 @@
-local temp_path = '/tmp/nvim-java-test-plugins'
+local temp_path = './.test_plugins'
 
 vim.opt.rtp:append(temp_path .. '/plenary.nvim')
 vim.opt.rtp:append(temp_path .. '/nvim-lspconfig')
+vim.opt.rtp:append(temp_path .. '/mason.nvim')