Skip to content

Commit 78875f5

Browse files
sumnekosumneko
committed
trace-global
1 parent fcafaa2 commit 78875f5

File tree

12 files changed

+124
-75
lines changed

12 files changed

+124
-75
lines changed

‎script/core/code-action.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ local function checkSwapParams(results, uri, start, finish)
487487
)
488488
elseif source.type == 'funcargs' then
489489
local var = source.parent.parent
490-
if guide.isSet(var) then
490+
if guide.isAssign(var) then
491491
if var.type == 'tablefield' then
492492
var = var.field
493493
end

‎script/core/code-lens.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function mt:collectReferences()
6969
---@async
7070
guide.eachSourceType(self.state.ast, 'function', function (src)
7171
local parent = src.parent
72-
if guide.isSet(parent) then
72+
if guide.isAssign(parent) then
7373
src = parent
7474
elseif parent.type == 'return' then
7575
else

‎script/core/completion/completion.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ local function checkFieldOfRefs(refs, state, word, startPos, position, parent, o
575575
end
576576
end
577577
funcs[name] = true
578-
if fields[name] and not guide.isSet(fields[name]) then
578+
if fields[name] and not guide.isAssign(fields[name]) then
579579
fields[name] = nil
580580
end
581581
goto CONTINUE
@@ -590,7 +590,7 @@ local function checkFieldOfRefs(refs, state, word, startPos, position, parent, o
590590
if vm.getDeprecated(src) then
591591
goto CONTINUE
592592
end
593-
if guide.isSet(src) then
593+
if guide.isAssign(src) then
594594
fields[name] = src
595595
goto CONTINUE
596596
end

‎script/core/reference.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ return function (uri, position, includeDeclaration)
8686
goto CONTINUE
8787
end
8888
if not includeDeclaration then
89-
if guide.isSet(src)
89+
if guide.isAssign(src)
9090
or guide.isLiteral(src) then
9191
goto CONTINUE
9292
end

‎script/core/semantic-tokens.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ local Care = util.switch()
198198
start = source.start,
199199
finish = source.finish,
200200
type = define.TokenTypes['function'],
201-
modifieres = guide.isSet(source) and define.TokenModifiers.declaration or nil,
201+
modifieres = guide.isAssign(source) and define.TokenModifiers.declaration or nil,
202202
}
203203
return
204204
end

‎script/parser/guide.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ local isSetMap = {
906906
['doc.type.field'] = true,
907907
['doc.type.array'] = true,
908908
}
909-
function m.isSet(source)
909+
function m.isAssign(source)
910910
local tp = source.type
911911
if isSetMap[tp] then
912912
return true

‎script/vm/compiler.lua‎

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ function vm.getClassFields(suri, object, key, pushResult)
350350
local fieldKey = guide.getKeyName(field)
351351
if fieldKey then
352352
if not searchedFields[fieldKey]
353-
and guide.isSet(field) then
353+
and guide.isAssign(field) then
354354
hasFounded[fieldKey] = true
355355
pushResult(field, true)
356356
end
@@ -370,7 +370,7 @@ function vm.getClassFields(suri, object, key, pushResult)
370370
local fieldKey = guide.getKeyName(field)
371371
if fieldKey then
372372
if not searchedFields[fieldKey]
373-
and guide.isSet(field) then
373+
and guide.isAssign(field) then
374374
hasFounded[fieldKey] = true
375375
pushResult(field, true)
376376
end
@@ -391,7 +391,7 @@ function vm.getClassFields(suri, object, key, pushResult)
391391
local fieldKey = guide.getKeyName(field)
392392
if fieldKey and not searchedFields[fieldKey] then
393393
if not searchedFields[fieldKey]
394-
and guide.isSet(field)
394+
and guide.isAssign(field)
395395
and field.value then
396396
if vm.getVariableID(field)
397397
and vm.getVariableID(field) == vm.getVariableID(field.value) then
@@ -1162,7 +1162,7 @@ local compilerSwitch = util.switch()
11621162
end
11631163

11641164
-- { f = function (<?x?>) end }
1165-
if guide.isSet(parent) then
1165+
if guide.isAssign(parent) then
11661166
vm.setNode(source, vm.compileNode(parent))
11671167
end
11681168
end)
@@ -1758,38 +1758,17 @@ local compilerSwitch = util.switch()
17581758
---@type vm.global
17591759
local global = source.global
17601760
local uri = guide.getUri(source)
1761-
local globalNode = vm.getNode(source)
1762-
if not globalNode then
1763-
return
1764-
end
1765-
globalNode:merge(global)
1761+
vm.setNode(source, global)
17661762
if global.cate == 'variable' then
1767-
local hasMarkDoc
1768-
for _, set in ipairs(global:getSets(uri)) do
1769-
if set.bindDocs and set.parent.type == 'main' then
1770-
if bindDocs(set) then
1771-
globalNode:merge(vm.compileNode(set))
1772-
hasMarkDoc = true
1773-
end
1774-
if vm.getNode(set) then
1775-
globalNode:merge(vm.compileNode(set))
1776-
end
1777-
end
1778-
end
1779-
-- Set all globals node first to avoid recursive
1780-
for _, set in ipairs(global:getSets(uri)) do
1781-
vm.setNode(set, globalNode, true)
1782-
end
1783-
for _, set in ipairs(global:getSets(uri)) do
1784-
if set.value and set.value.type ~= 'nil' and set.parent.type == 'main' then
1785-
if not hasMarkDoc or guide.isLiteral(set.value) then
1786-
globalNode:merge(vm.compileNode(set.value))
1763+
for luri, link in pairs(global.links) do
1764+
if luri ~= uri then
1765+
local firstSet = link.sets[1]
1766+
if firstSet then
1767+
local setNode = vm.compileNode(firstSet)
1768+
vm.setNode(source, setNode)
17871769
end
17881770
end
17891771
end
1790-
for _, set in ipairs(global:getSets(uri)) do
1791-
vm.setNode(set, globalNode, true)
1792-
end
17931772
end
17941773
if global.cate == 'type' then
17951774
for _, set in ipairs(global:getSets(uri)) do
@@ -1798,15 +1777,15 @@ local compilerSwitch = util.switch()
17981777
for _, ext in ipairs(set.extends) do
17991778
if ext.type == 'doc.type.table' then
18001779
if not vm.getGeneric(ext) then
1801-
globalNode:merge(vm.compileNode(ext))
1780+
vm.setNode(source, vm.compileNode(ext))
18021781
end
18031782
end
18041783
end
18051784
end
18061785
end
18071786
if set.type == 'doc.alias' then
18081787
if not vm.getGeneric(set.extends) then
1809-
globalNode:merge(vm.compileNode(set.extends))
1788+
vm.setNode(source, vm.compileNode(set.extends))
18101789
end
18111790
end
18121791
end

‎script/vm/def.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ function vm.getDefs(source)
7878
end
7979
if not mark[src] then
8080
mark[src] = true
81-
if guide.isSet(src)
81+
if guide.isAssign(src)
8282
or guide.isLiteral(src) then
8383
results[#results+1] = src
8484
end

‎script/vm/global.lua‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ local vm = require 'vm.vm'
1111
---@field global vm.global
1212

1313
---@class vm.global.link
14-
---@field sets parser.object[]
15-
---@field hasGet boolean?
14+
---@field sets parser.object[]
15+
---@field gets parser.object[]
1616

1717
---@class vm.global
1818
---@field links table<uri, vm.global.link>
@@ -27,17 +27,15 @@ mt.name = ''
2727
---@param source parser.object
2828
function mt:addSet(uri, source)
2929
local link = self.links[uri]
30-
if not link.sets then
31-
link.sets = {}
32-
end
3330
link.sets[#link.sets+1] = source
3431
self.setsCache = nil
3532
end
3633

3734
---@param uri uri
38-
function mt:addGet(uri)
35+
---@param source parser.object
36+
function mt:addGet(uri, source)
3937
local link = self.links[uri]
40-
link.hasGet = true
38+
link.gets[#link.gets+1] = source
4139
end
4240

4341
---@param suri uri
@@ -128,7 +126,12 @@ local function createGlobal(name, cate)
128126
return setmetatable({
129127
name = name,
130128
cate = cate,
131-
links = util.multiTable(2),
129+
links = util.multiTable(2, function ()
130+
return {
131+
sets = {},
132+
gets = {},
133+
}
134+
end),
132135
}, mt)
133136
end
134137

@@ -183,7 +186,7 @@ local compilerGlobalSwitch = util.switch()
183186
return
184187
end
185188
local global = vm.declareGlobal('variable', name, uri)
186-
global:addGet(uri)
189+
global:addGet(uri, source)
187190
source._globalNode = global
188191

189192
local nxt = source.next
@@ -241,7 +244,7 @@ local compilerGlobalSwitch = util.switch()
241244
end
242245
local uri = guide.getUri(source)
243246
local global = vm.declareGlobal('variable', name, uri)
244-
global:addGet(uri)
247+
global:addGet(uri, source)
245248
source._globalNode = global
246249

247250
local nxt = source.next
@@ -267,7 +270,7 @@ local compilerGlobalSwitch = util.switch()
267270
global:addSet(uri, source)
268271
source.value = source.args[3]
269272
else
270-
global:addGet(uri)
273+
global:addGet(uri, source)
271274
end
272275
source._globalNode = global
273276

@@ -366,15 +369,15 @@ local compilerGlobalSwitch = util.switch()
366369
return
367370
end
368371
local type = vm.declareGlobal('type', name, uri)
369-
type:addGet(uri)
372+
type:addGet(uri, source)
370373
source._globalNode = type
371374
end)
372375
: case 'doc.extends.name'
373376
: call(function (source)
374377
local uri = guide.getUri(source)
375378
local name = source[1]
376379
local class = vm.declareGlobal('type', name, uri)
377-
class:addGet(uri)
380+
class:addGet(uri, source)
378381
source._globalNode = class
379382
end)
380383

@@ -515,6 +518,15 @@ function vm.compileByGlobal(source)
515518
if not global then
516519
return
517520
end
521+
if global.cate == 'variable' then
522+
vm.setNode(source, global)
523+
if guide.isAssign(source) then
524+
vm.setNode(source, vm.compileNode(source.value))
525+
return
526+
end
527+
vm.traceNode(source)
528+
return
529+
end
518530
local globalBase = vm.getGlobalBase(source)
519531
if not globalBase then
520532
return
@@ -544,6 +556,8 @@ function vm.getGlobalBase(source)
544556
type = 'globalbase',
545557
parent = root,
546558
global = global,
559+
start = 0,
560+
finish = 0,
547561
}
548562
end
549563
source._globalBase = root._globalBaseMap[name]

‎script/vm/infer.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ local viewNodeSwitch;viewNodeSwitch = util.switch()
6060
: case 'function'
6161
: call(function (source, infer)
6262
local parent = source.parent
63-
if guide.isSet(parent) then
63+
if guide.isAssign(parent) then
6464
infer._hasFunctionDef = true
6565
end
6666
return source.type

0 commit comments

Comments
 (0)