From 823c4179bda90303e3e42bf55cbb8f7ec27d7dfe Mon Sep 17 00:00:00 2001 From: Periapsises <94928308+Periapsises@users.noreply.github.com> Date: Tue, 10 Feb 2026 14:10:19 -0500 Subject: [PATCH 1/3] Add the source uri argument to ResolveRequire --- script/workspace/require-path.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/workspace/require-path.lua b/script/workspace/require-path.lua index b0e8cb452..4af27287a 100644 --- a/script/workspace/require-path.lua +++ b/script/workspace/require-path.lua @@ -151,7 +151,7 @@ end ---@param name string ---@return uri[] ---@return table? -function mt:searchUrisByRequireName(name) +function mt:searchUrisByRequireName(name, suri) local vm = require 'vm' local searchers = config.get(self.scp.uri, 'Lua.runtime.path') local strict = config.get(self.scp.uri, 'Lua.runtime.pathStrict') @@ -161,7 +161,7 @@ function mt:searchUrisByRequireName(name) local searcherMap = {} local excludes = {} - local pluginSuccess, pluginResults = plugin.dispatch('ResolveRequire', self.scp.uri, name) + local pluginSuccess, pluginResults = plugin.dispatch('ResolveRequire', self.scp.uri, name, suri) if pluginSuccess and pluginResults ~= nil then return pluginResults end @@ -226,7 +226,7 @@ function mt:findUrisByRequireName(suri, name) end local cache = self.requireCache[name] if not cache then - local results, searcherMap = self:searchUrisByRequireName(name) + local results, searcherMap = self:searchUrisByRequireName(name, suri) cache = { results = results, searcherMap = searcherMap, From b386968af95381b9cc1942b9706c01f083098eb5 Mon Sep 17 00:00:00 2001 From: Periapsises <94928308+Periapsises@users.noreply.github.com> Date: Tue, 10 Feb 2026 14:26:12 -0500 Subject: [PATCH 2/3] Update changelog --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index f87ef3e54..3b605d2cf 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,7 @@ ## Unreleased +* `CHG` Modified the `ResolveRequire` function to pass the source URI as a third argument. ## 3.17.1 `2026-01-20` From 7aef27a13277d432440c02c1f1c4c58ec282877c Mon Sep 17 00:00:00 2001 From: Periapsises <94928308+Periapsises@users.noreply.github.com> Date: Tue, 10 Feb 2026 14:27:19 -0500 Subject: [PATCH 3/3] Add missing annotation for new argument --- script/workspace/require-path.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/script/workspace/require-path.lua b/script/workspace/require-path.lua index 4af27287a..3ab414962 100644 --- a/script/workspace/require-path.lua +++ b/script/workspace/require-path.lua @@ -149,6 +149,7 @@ end --- 查找符合指定require name的所有uri ---@param name string +---@param suri uri ---@return uri[] ---@return table? function mt:searchUrisByRequireName(name, suri)