Skip to content

Commit 08cfac5

Browse files
authored
Merge branch 'master' into master
2 parents e4ded21 + d965edc commit 08cfac5

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## Unreleased
44
<!-- Add all new changes here. They will be moved under a version at release -->
55
* `FIX` Deduplicate documentation bindings for parameters
6+
* `CHG` Modified the `ResolveRequire` function to pass the source URI as a third argument.
67

78
## 3.17.1
89
`2026-01-20`

script/workspace/require-path.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,10 @@ end
149149

150150
--- 查找符合指定require name的所有uri
151151
---@param name string
152+
---@param suri uri
152153
---@return uri[]
153154
---@return table<uri, string>?
154-
function mt:searchUrisByRequireName(name)
155+
function mt:searchUrisByRequireName(name, suri)
155156
local vm = require 'vm'
156157
local searchers = config.get(self.scp.uri, 'Lua.runtime.path')
157158
local strict = config.get(self.scp.uri, 'Lua.runtime.pathStrict')
@@ -161,7 +162,7 @@ function mt:searchUrisByRequireName(name)
161162
local searcherMap = {}
162163
local excludes = {}
163164

164-
local pluginSuccess, pluginResults = plugin.dispatch('ResolveRequire', self.scp.uri, name)
165+
local pluginSuccess, pluginResults = plugin.dispatch('ResolveRequire', self.scp.uri, name, suri)
165166
if pluginSuccess and pluginResults ~= nil then
166167
return pluginResults
167168
end
@@ -226,7 +227,7 @@ function mt:findUrisByRequireName(suri, name)
226227
end
227228
local cache = self.requireCache[name]
228229
if not cache then
229-
local results, searcherMap = self:searchUrisByRequireName(name)
230+
local results, searcherMap = self:searchUrisByRequireName(name, suri)
230231
cache = {
231232
results = results,
232233
searcherMap = searcherMap,

0 commit comments

Comments
 (0)