summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
author最萌小汐 <sumneko@hotmail.com>2021-11-15 17:00:50 +0800
committer最萌小汐 <sumneko@hotmail.com>2021-11-15 17:00:50 +0800
commitaa100883142d9512fc9e1de5832c72a3cda0bdfe (patch)
tree8719ec0ef0d76a6e75ba66873c8a8b710fcbdaf8 /script
parent3b194eccf878918e7202a98f4765c3015eb93d28 (diff)
parent9fbcebbad7861dc842937d88b86d3f6e7039f9d7 (diff)
downloadlua-language-server-aa100883142d9512fc9e1de5832c72a3cda0bdfe.zip
Merge branch 'B2.4.8'
Diffstat (limited to 'script')
-rw-r--r--script/core/searcher.lua5
-rw-r--r--script/provider/provider.lua3
2 files changed, 5 insertions, 3 deletions
diff --git a/script/core/searcher.lua b/script/core/searcher.lua
index c5180a54..3c210b1b 100644
--- a/script/core/searcher.lua
+++ b/script/core/searcher.lua
@@ -850,7 +850,6 @@ function m.searchRefsByID(status, suri, expect, mode)
local function searchNode(uri, id, field)
local noders = nodersMap[uri]
local call = noders.call[id]
- local global = isGlobalID(id)
callStack[#callStack+1] = call
if field == nil and not ignoredSources[id] then
@@ -865,8 +864,8 @@ function m.searchRefsByID(status, suri, expect, mode)
checkRequire(uri, requireName, field)
end
- local elock = global and elockMap['@global'] or elockMap[uri]
- local ecall = global and ecallMap['@global'] or ecallMap[uri]
+ local elock = elockMap[uri]
+ local ecall = ecallMap[uri]
if lockExpanding(elock, ecall, id, field) then
if noders.forward[id] then
diff --git a/script/provider/provider.lua b/script/provider/provider.lua
index 6288ae02..d732f3c2 100644
--- a/script/provider/provider.lua
+++ b/script/provider/provider.lua
@@ -953,6 +953,9 @@ do
if not config.get 'Lua.hint.enable' then
return
end
+ await.close 'updateHint'
+ await.setID 'updateHint'
+ workspace.awaitReady()
local visibles = files.getVisibles(uri)
if not visibles then
return