Skip to content

Commit 08135e0

Browse files
sumnekosumneko
committed
cleanup
1 parent 6632a27 commit 08135e0

File tree

20 files changed

+65
-75
lines changed

20 files changed

+65
-75
lines changed

‎script/core/completion/completion.lua‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ local rpath = require 'workspace.require-path'
1616
local lang = require 'language'
1717
local lookBackward = require 'core.look-backward'
1818
local guide = require 'parser.guide'
19-
local infer = require 'vm.infer'
2019
local await = require 'await'
2120
local postfix = require 'core.completion.postfix'
2221
local globalMgr = require 'vm.global-manager'
@@ -186,8 +185,8 @@ local function buildFunctionSnip(source, value, oop)
186185
end
187186

188187
local function buildDetail(source)
189-
local types = infer.getInfer(source):view()
190-
local literals = infer.getInfer(source):viewLiterals()
188+
local types = vm.getInfer(source):view()
189+
local literals = vm.getInfer(source):viewLiterals()
191190
if literals then
192191
return types .. ' = ' .. literals
193192
else
@@ -304,7 +303,7 @@ local function checkLocal(state, word, position, results)
304303
if name:sub(1, 1) == '@' then
305304
goto CONTINUE
306305
end
307-
if infer.getInfer(source):hasFunction() then
306+
if vm.getInfer(source):hasFunction() then
308307
for _, def in ipairs(vm.getDefs(source)) do
309308
if def.type == 'function'
310309
or def.type == 'doc.type.function' then
@@ -499,7 +498,7 @@ local function checkFieldThen(state, name, src, word, startPos, position, parent
499498
})
500499
return
501500
end
502-
if oop and not infer.getInfer(src):hasFunction() then
501+
if oop and not vm.getInfer(src):hasFunction() then
503502
return
504503
end
505504
local literal = guide.getLiteral(value)
@@ -1118,7 +1117,7 @@ local function checkTypingEnum(state, position, defs, str, results)
11181117
or def.type == 'doc.type.integer'
11191118
or def.type == 'doc.type.boolean' then
11201119
enums[#enums+1] = {
1121-
label = infer.viewObject(def),
1120+
label = vm.viewObject(def),
11221121
description = def.comment and def.comment.text,
11231122
kind = define.CompletionItemKind.EnumMember,
11241123
}
@@ -1407,7 +1406,7 @@ local function tryCallArg(state, position, results)
14071406
or src.type == 'doc.type.integer'
14081407
or src.type == 'doc.type.boolean' then
14091408
enums[#enums+1] = {
1410-
label = infer.viewObject(src),
1409+
label = vm.viewObject(src),
14111410
description = src.comment,
14121411
kind = define.CompletionItemKind.EnumMember,
14131412
}
@@ -1426,7 +1425,7 @@ local function tryCallArg(state, position, results)
14261425
: string()
14271426
end
14281427
enums[#enums+1] = {
1429-
label = infer.getInfer(src):view(),
1428+
label = vm.getInfer(src):view(),
14301429
description = description,
14311430
kind = define.CompletionItemKind.Function,
14321431
insertText = insertText,
@@ -1805,14 +1804,14 @@ local function buildluaDocOfFunction(func)
18051804
local returns = {}
18061805
if func.args then
18071806
for _, arg in ipairs(func.args) do
1808-
args[#args+1] = infer.getInfer(arg):view()
1807+
args[#args+1] = vm.getInfer(arg):view()
18091808
end
18101809
end
18111810
if func.returns then
18121811
for _, rtns in ipairs(func.returns) do
18131812
for n = 1, #rtns do
18141813
if not returns[n] then
1815-
returns[n] = infer.getInfer(rtns[n]):view()
1814+
returns[n] = vm.getInfer(rtns[n]):view()
18161815
end
18171816
end
18181817
end

‎script/core/diagnostics/duplicate-doc-field.lua‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
local files = require 'files'
22
local lang = require 'language'
3-
local infer = require 'vm.infer'
43

54
local function getFieldEventName(doc)
65
if not doc.extends then

‎script/core/diagnostics/no-unknown.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
local files = require 'files'
22
local guide = require 'parser.guide'
33
local lang = require 'language'
4-
local infer = require 'vm.infer'
4+
local vm = require 'vm'
55

66
return function (uri, callback)
77
local ast = files.getState(uri)
@@ -20,7 +20,7 @@ return function (uri, callback)
2020
and source.type ~= 'tableindex' then
2121
return
2222
end
23-
if infer.getInfer(source):view() == 'unknown' then
23+
if vm.getInfer(source):view() == 'unknown' then
2424
callback {
2525
start = source.start,
2626
finish = source.finish,

‎script/core/diagnostics/not-yieldable.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ local await = require 'await'
33
local guide = require 'parser.guide'
44
local vm = require 'vm'
55
local lang = require 'language'
6-
local infer = require 'vm.infer'
76

87
local function isYieldAble(defs, i)
98
local hasFuncDef
@@ -12,7 +11,7 @@ local function isYieldAble(defs, i)
1211
local arg = def.args and def.args[i]
1312
if arg then
1413
hasFuncDef = true
15-
if infer.getInfer(arg):hasType 'any'
14+
if vm.getInfer(arg):hasType 'any'
1615
or vm.isAsync(arg, true)
1716
or arg.type == '...' then
1817
return true
@@ -23,7 +22,7 @@ local function isYieldAble(defs, i)
2322
local arg = def.args and def.args[i]
2423
if arg then
2524
hasFuncDef = true
26-
if infer.getInfer(arg.extends):hasType 'any'
25+
if vm.getInfer(arg.extends):hasType 'any'
2726
or vm.isAsync(arg.extends, true) then
2827
return true
2928
end

‎script/core/diagnostics/undefined-field.lua‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ local vm = require 'vm'
33
local lang = require 'language'
44
local guide = require 'parser.guide'
55
local await = require 'await'
6-
local infer = require 'vm.infer'
76

87
local skipCheckClass = {
98
['unknown'] = true,
@@ -35,7 +34,7 @@ return function (uri, callback)
3534
local node = src.node
3635
if node then
3736
local ok
38-
for view in infer.getInfer(node):eachView() do
37+
for view in vm.getInfer(node):eachView() do
3938
if not skipCheckClass[view] then
4039
ok = true
4140
break

‎script/core/hint.lua‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
local files = require 'files'
2-
local infer = require 'vm.infer'
32
local vm = require 'vm'
43
local config = require 'config'
54
local guide = require 'parser.guide'
@@ -39,7 +38,7 @@ local function typeHint(uri, results, start, finish)
3938
end
4039
end
4140
await.delay()
42-
local view = infer.getInfer(source):view()
41+
local view = vm.getInfer(source):view()
4342
if view == 'any'
4443
or view == 'unknown'
4544
or view == 'nil' then

‎script/core/hover/args.lua‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
local guide = require 'parser.guide'
2-
local infer = require 'vm.infer'
32
local vm = require 'vm'
43

54
local function asFunction(source)
@@ -10,7 +9,7 @@ local function asFunction(source)
109
methodDef = true
1110
end
1211
if methodDef then
13-
args[#args+1] = ('self: %s'):format(infer.getInfer(parent.node):view 'any')
12+
args[#args+1] = ('self: %s'):format(vm.getInfer(parent.node):view 'any')
1413
end
1514
if source.args then
1615
for i = 1, #source.args do
@@ -30,15 +29,15 @@ local function asFunction(source)
3029
args[#args+1] = ('%s%s: %s'):format(
3130
name,
3231
optional and '?' or '',
33-
infer.getInfer(argNode):view('any', guide.getUri(source))
32+
vm.getInfer(argNode):view('any', guide.getUri(source))
3433
)
3534
elseif arg.type == '...' then
3635
args[#args+1] = ('%s: %s'):format(
3736
'...',
38-
infer.getInfer(arg):view 'any'
37+
vm.getInfer(arg):view 'any'
3938
)
4039
else
41-
args[#args+1] = ('%s'):format(infer.getInfer(arg):view 'any')
40+
args[#args+1] = ('%s'):format(vm.getInfer(arg):view 'any')
4241
end
4342
::CONTINUE::
4443
end
@@ -57,7 +56,7 @@ local function asDocFunction(source)
5756
args[i] = ('%s%s: %s'):format(
5857
name,
5958
arg.optional and '?' or '',
60-
arg.extends and infer.getInfer(arg.extends):view 'any' or 'any'
59+
arg.extends and vm.getInfer(arg.extends):view 'any' or 'any'
6160
)
6261
end
6362
return args

‎script/core/hover/description.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ local lang = require 'language'
66
local util = require 'utility'
77
local guide = require 'parser.guide'
88
local rpath = require 'workspace.require-path'
9-
local infer = require 'vm.infer'
109

1110
local function collectRequire(mode, literal, uri)
1211
local result, searchers
@@ -153,7 +152,7 @@ local function buildEnumChunk(docType, name)
153152
local types = {}
154153
local lines = {}
155154
for _, tp in ipairs(vm.getDefs(docType)) do
156-
types[#types+1] = infer.getInfer(tp):view()
155+
types[#types+1] = vm.getInfer(tp):view()
157156
if tp.type == 'doc.type.string'
158157
or tp.type == 'doc.type.integer'
159158
or tp.type == 'doc.type.boolean' then
@@ -175,7 +174,7 @@ local function buildEnumChunk(docType, name)
175174
(enum.default and '->')
176175
or (enum.additional and '+>')
177176
or ' |',
178-
infer.viewObject(enum)
177+
vm.viewObject(enum)
179178
)
180179
if enum.comment then
181180
local first = true

‎script/core/hover/init.lua‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ local getDesc = require 'core.hover.description'
55
local util = require 'utility'
66
local findSource = require 'core.find-source'
77
local markdown = require 'provider.markdown'
8-
local infer = require 'vm.infer'
98
local guide = require 'parser.guide'
109

1110
---@async
@@ -40,7 +39,7 @@ local function getHover(source)
4039
end
4140

4241
local oop
43-
if infer.getInfer(source):view() == 'function' then
42+
if vm.getInfer(source):view() == 'function' then
4443
local hasFunc
4544
for _, def in ipairs(vm.getDefs(source)) do
4645
if guide.isOOP(def) then

‎script/core/hover/label.lua‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ local buildName = require 'core.hover.name'
22
local buildArgs = require 'core.hover.args'
33
local buildReturn = require 'core.hover.return'
44
local buildTable = require 'core.hover.table'
5-
local infer = require 'vm.infer'
65
local vm = require 'vm'
76
local util = require 'utility'
87
local lang = require 'language'
@@ -34,15 +33,15 @@ local function asDocTypeName(source)
3433
return '(class) ' .. doc.class[1]
3534
end
3635
if doc.type == 'doc.alias' then
37-
return '(alias) ' .. doc.alias[1] .. ' ' .. lang.script('HOVER_EXTENDS', infer.getInfer(doc.extends):view())
36+
return '(alias) ' .. doc.alias[1] .. ' ' .. lang.script('HOVER_EXTENDS', vm.getInfer(doc.extends):view())
3837
end
3938
end
4039
end
4140

4241
---@async
4342
local function asValue(source, title)
4443
local name = buildName(source, false) or ''
45-
local ifr = infer.getInfer(source)
44+
local ifr = vm.getInfer(source)
4645
local type = ifr:view()
4746
local literal = ifr:viewLiterals()
4847
local cont = buildTable(source)
@@ -140,7 +139,7 @@ local function asDocFieldName(source)
140139
break
141140
end
142141
end
143-
local view = infer.getInfer(source.extends):view()
142+
local view = vm.getInfer(source.extends):view()
144143
if not class then
145144
return ('(field) ?.%s: %s'):format(name, view)
146145
end

0 commit comments

Comments
 (0)