From ac767592473104dd0cf11725c73470cd47b81b7e Mon Sep 17 00:00:00 2001 From: William Boman Date: Fri, 21 Apr 2023 21:33:02 +0200 Subject: chore: remove lua:mason-registry.index registry entry (#1243) --- scripts/lua/mason-scripts/mason/generate.lua | 28 ++-------------------- .../mason-scripts/mason/generate_package_index.lua | 4 ++-- 2 files changed, 4 insertions(+), 28 deletions(-) (limited to 'scripts/lua/mason-scripts') diff --git a/scripts/lua/mason-scripts/mason/generate.lua b/scripts/lua/mason-scripts/mason/generate.lua index dd3672b0..a0590f61 100644 --- a/scripts/lua/mason-scripts/mason/generate.lua +++ b/scripts/lua/mason-scripts/mason/generate.lua @@ -4,14 +4,12 @@ local path = require "mason-core.path" local script_utils = require "mason-scripts.utils" local MASON_DIR = path.concat { vim.loop.cwd(), "lua", "mason" } -local MASON_REGISTRY_DIR = path.concat { vim.loop.cwd(), "lua", "mason-registry" } require("mason").setup() -require("mason-registry").refresh() +local registry = require "mason-registry" ---@async local function create_language_map() - local registry = require "mason-registry" print "Creating language map…" local indexed_languages = {} local language_map = {} @@ -38,29 +36,7 @@ local function create_language_map() "w" ) end - ----@async -local function create_package_index() - a.scheduler() - print "Creating package index…" - local packages = {} - local to_lua_path = _.compose(_.gsub("/", "."), _.gsub("^lua/", "")) - for _, package_path in ipairs(vim.fn.glob("lua/mason-registry/index/*/init.lua", false, true)) do - local package_filename = vim.fn.fnamemodify(package_path, ":h:t") - local lua_path = to_lua_path(vim.fn.fnamemodify(package_path, ":h")) - local pkg = require(lua_path) - assert(package_filename == pkg.name, ("Package name is not the same as its module name %s"):format(lua_path)) - packages[pkg.name] = lua_path - end - - script_utils.write_file( - path.concat { MASON_REGISTRY_DIR, "index", "init.lua" }, - "return " .. vim.inspect(packages), - "w" - ) -end - a.run_blocking(function() - create_package_index() + assert(a.wait(registry.update), "Failed to update registry.") create_language_map() end) diff --git a/scripts/lua/mason-scripts/mason/generate_package_index.lua b/scripts/lua/mason-scripts/mason/generate_package_index.lua index 526cb9d4..9b537b97 100644 --- a/scripts/lua/mason-scripts/mason/generate_package_index.lua +++ b/scripts/lua/mason-scripts/mason/generate_package_index.lua @@ -4,11 +4,10 @@ local markdown = require "mason-scripts.markdown" local script_utils = require "mason-scripts.utils" require("mason").setup() -require("mason-registry").refresh() +local registry = require "mason-registry" ---@async local function create_markdown_index() - local registry = require "mason-registry" print "Creating markdown index…" local packages = _.sort_by(_.prop "name", registry.get_all_packages()) @@ -21,5 +20,6 @@ local function create_markdown_index() end a.run_blocking(function() + assert(a.wait(registry.update), "Failed to update registry.") create_markdown_index() end) -- cgit v1.2.3-70-g09d2