chore: remove lua:mason-registry.index registry entry (#1243)

6 files changed, 5 insertions, 34 deletions

diff --git a/README.md b/README.md
index 839b73e0..58a56209 100644
--- a/README.md
+++ b/README.md
@@ -201,7 +201,6 @@ local DEFAULT_SETTINGS = {
     -- The registries to source packages from. Accepts multiple entries. Should a package with the same name exist in
     -- multiple registries, the registry listed first will be used.
     registries = {
-        "lua:mason-registry.index",
         "github:mason-org/mason-registry",
     },
 
diff --git a/doc/mason.txt b/doc/mason.txt
index 178ca4be..d29abaf4 100644
--- a/doc/mason.txt
+++ b/doc/mason.txt
@@ -278,7 +278,6 @@ Example:
         -- The registries to source packages from. Accepts multiple entries. Should a package with the same name exist in
         -- multiple registries, the registry listed first will be used.
         registries = {
-            "lua:mason-registry.index",
             "github:mason-org/mason-registry",
         },
 
diff --git a/lua/mason-registry/index/init.lua b/lua/mason-registry/index/init.lua
index aa2bd5a4..a5647075 100644
--- a/lua/mason-registry/index/init.lua
+++ b/lua/mason-registry/index/init.lua
@@ -1,3 +1 @@
--- THIS FILE IS GENERATED. DO NOT EDIT MANUALLY.
--- stylua: ignore start
-return {}
\ No newline at end of file
+return {}
diff --git a/lua/mason/settings.lua b/lua/mason/settings.lua
index 70b7c335..9ce965ea 100644
--- a/lua/mason/settings.lua
+++ b/lua/mason/settings.lua
@@ -26,7 +26,6 @@ local DEFAULT_SETTINGS = {
     -- The registries to source packages from. Accepts multiple entries. Should a package with the same name exist in
     -- multiple registries, the registry listed first will be used.
     registries = {
-        "lua:mason-registry.index",
         "github:mason-org/mason-registry",
     },
 
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)