From 4da89f3ab04783da990f9bd40aaa36c22e59375b Mon Sep 17 00:00:00 2001 From: William Boman Date: Fri, 2 May 2025 03:52:10 +0200 Subject: refactor(registry): change lua registries to not instantiate Package themselves Instead of having Lua registries instantiate package instances themselves we now do it in the installer of Lua registry sources. This aligns the behaviour of the Lua registry protocol with the other registry protocols. --- tests/helpers/lua/dummy-registry/dummy.lua | 14 ++++++++++++++ tests/helpers/lua/dummy-registry/dummy2.lua | 14 ++++++++++++++ tests/helpers/lua/dummy-registry/dummy2_package.lua | 17 ----------------- tests/helpers/lua/dummy-registry/dummy_package.lua | 17 ----------------- tests/helpers/lua/dummy-registry/index.lua | 6 +++--- tests/helpers/lua/dummy-registry/registry.lua | 11 +++++++++++ tests/helpers/lua/dummy-registry/registry_package.lua | 14 -------------- 7 files changed, 42 insertions(+), 51 deletions(-) create mode 100644 tests/helpers/lua/dummy-registry/dummy.lua create mode 100644 tests/helpers/lua/dummy-registry/dummy2.lua delete mode 100644 tests/helpers/lua/dummy-registry/dummy2_package.lua delete mode 100644 tests/helpers/lua/dummy-registry/dummy_package.lua create mode 100644 tests/helpers/lua/dummy-registry/registry.lua delete mode 100644 tests/helpers/lua/dummy-registry/registry_package.lua (limited to 'tests/helpers/lua') diff --git a/tests/helpers/lua/dummy-registry/dummy.lua b/tests/helpers/lua/dummy-registry/dummy.lua new file mode 100644 index 00000000..4b06f4d1 --- /dev/null +++ b/tests/helpers/lua/dummy-registry/dummy.lua @@ -0,0 +1,14 @@ +return { + name = "dummy", + description = [[This is a dummy package.]], + homepage = "https://example.com", + licenses = { "MIT" }, + languages = { "DummyLang" }, + categories = { "LSP" }, + source = { + id = "pkg:mason/dummy@1.0.0", + ---@async + ---@param ctx InstallContext + install = function(ctx) end, + }, +} diff --git a/tests/helpers/lua/dummy-registry/dummy2.lua b/tests/helpers/lua/dummy-registry/dummy2.lua new file mode 100644 index 00000000..8dc26c9f --- /dev/null +++ b/tests/helpers/lua/dummy-registry/dummy2.lua @@ -0,0 +1,14 @@ +return { + name = "dummy2", + description = [[This is a dummy2 package.]], + homepage = "https://example.com", + licenses = { "MIT" }, + languages = { "Dummy2Lang" }, + categories = { "LSP" }, + source = { + id = "pkg:mason/dummy2@1.0.0", + ---@async + ---@param ctx InstallContext + install = function(ctx) end, + }, +} diff --git a/tests/helpers/lua/dummy-registry/dummy2_package.lua b/tests/helpers/lua/dummy-registry/dummy2_package.lua deleted file mode 100644 index 008d27b2..00000000 --- a/tests/helpers/lua/dummy-registry/dummy2_package.lua +++ /dev/null @@ -1,17 +0,0 @@ -local Pkg = require "mason-core.package" - -return Pkg:new { - schema = "registry+v1", - name = "dummy2", - description = [[This is a dummy2 package.]], - homepage = "https://example.com", - licenses = { Pkg.License.MIT }, - languages = { Pkg.Lang.Dummy2Lang }, - categories = { Pkg.Cat.LSP }, - source = { - id = "pkg:mason/dummy2@1.0.0", - ---@async - ---@param ctx InstallContext - install = function(ctx) end, - }, -} diff --git a/tests/helpers/lua/dummy-registry/dummy_package.lua b/tests/helpers/lua/dummy-registry/dummy_package.lua deleted file mode 100644 index 4fbaf44d..00000000 --- a/tests/helpers/lua/dummy-registry/dummy_package.lua +++ /dev/null @@ -1,17 +0,0 @@ -local Pkg = require "mason-core.package" - -return Pkg:new { - schema = "registry+v1", - name = "dummy", - description = [[This is a dummy package.]], - homepage = "https://example.com", - licenses = { Pkg.License.MIT }, - languages = { Pkg.Lang.DummyLang }, - categories = { Pkg.Cat.LSP }, - source = { - id = "pkg:mason/dummy@1.0.0", - ---@async - ---@param ctx InstallContext - install = function(ctx) end, - }, -} diff --git a/tests/helpers/lua/dummy-registry/index.lua b/tests/helpers/lua/dummy-registry/index.lua index 85fe000f..112a2df2 100644 --- a/tests/helpers/lua/dummy-registry/index.lua +++ b/tests/helpers/lua/dummy-registry/index.lua @@ -1,5 +1,5 @@ return { - ["dummy"] = "dummy-registry.dummy_package", - ["dummy2"] = "dummy-registry.dummy2_package", - ["registry"] = "dummy-registry.registry_package", + ["dummy"] = "dummy-registry.dummy", + ["dummy2"] = "dummy-registry.dummy2", + ["registry"] = "dummy-registry.registry", } diff --git a/tests/helpers/lua/dummy-registry/registry.lua b/tests/helpers/lua/dummy-registry/registry.lua new file mode 100644 index 00000000..3cc4858b --- /dev/null +++ b/tests/helpers/lua/dummy-registry/registry.lua @@ -0,0 +1,11 @@ +return { + name = "registry", + description = [[This is a dummy package.]], + homepage = "https://example.com", + licenses = { "MIT" }, + languages = { "DummyLang" }, + categories = { "LSP" }, + source = { + id = "pkg:dummy/registry@1.0.0", + }, +} diff --git a/tests/helpers/lua/dummy-registry/registry_package.lua b/tests/helpers/lua/dummy-registry/registry_package.lua deleted file mode 100644 index 7e5d9fbd..00000000 --- a/tests/helpers/lua/dummy-registry/registry_package.lua +++ /dev/null @@ -1,14 +0,0 @@ -local Pkg = require "mason-core.package" - -return Pkg:new { - schema = "registry+v1", - name = "registry", - description = [[This is a dummy package.]], - homepage = "https://example.com", - licenses = { "MIT" }, - languages = { "DummyLang" }, - categories = { "LSP" }, - source = { - id = "pkg:dummy/registry@1.0.0", - }, -} -- cgit v1.2.3-70-g09d2