Skip to content

Commit 5990654

Browse files
committed
fix #1034 don't require self
1 parent bce8b09 commit 5990654

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## 3.0.1
44
* `FIX` [#1033](https://github.com./sumneko/lua-language-server/issues/1033)
5+
* `FIX` [#1034](https://github.com./sumneko/lua-language-server/issues/1034)
56

67
## 3.0.0
78
`2022-4-10`

script/workspace/require-path.lua

+8-6
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,14 @@ function m.findUrisByRequirePath(suri, path)
123123
local clt = scope.getScope(suri):get('requireName')
124124
if clt then
125125
for _, uri in clt:each(suri, fspath) do
126-
local infos = m.getVisiblePath(suri, furi.decode(uri))
127-
for _, info in ipairs(infos) do
128-
local fsexpect = info.expect:gsub('%' .. separator, '/')
129-
if fsexpect == fspath then
130-
results[#results+1] = uri
131-
searchers[uri] = info.searcher
126+
if uri ~= suri then
127+
local infos = m.getVisiblePath(suri, furi.decode(uri))
128+
for _, info in ipairs(infos) do
129+
local fsexpect = info.expect:gsub('%' .. separator, '/')
130+
if fsexpect == fspath then
131+
results[#results+1] = uri
132+
searchers[uri] = info.searcher
133+
end
132134
end
133135
end
134136
end

test/crossfile/definition.lua

+11
Original file line numberDiff line numberDiff line change
@@ -977,3 +977,14 @@ print(t.<?x?>)
977977

978978
config.set(nil, 'Lua.runtime.pathStrict', false)
979979
config.set(nil, 'Lua.runtime.path', originRuntimePath)
980+
981+
-- Don't require self
982+
TEST {
983+
{
984+
path = 'a.lua',
985+
content = [[
986+
local <~f~> = require 'a'
987+
return function () end
988+
]]
989+
}
990+
}

0 commit comments

Comments
 (0)