update

Author: sumneko

script/core/completion/completion.lua

@@ -19,6 +19,7 @@ local guide = require 'parser.guide'
 localinfer=require'vm.infer'
 localawait=require'await'
 localpostfix=require'core.completion.postfix'
+localglobalMgr=require'vm.global-manager'
 
 localdiagnosticModes= {
 'disable-next-line',
@@ -287,7 +288,7 @@ local function checkLocal(state, word, position, results)
 ifname:sub(1, 1) =='@' then
 gotoCONTINUE
 end
-ifinfer.hasType(source,'function')then
+ifinfer.getInfer(source):hasType'function' then
 for_, definipairs(vm.getDefs(source)) do
 ifdef.type=='function'
 ordef.type=='doc.type.function' then
@@ -335,7 +336,7 @@ local function checkModule(state, word, position, results)
 localfileName=path:match'[^/\\]*$'
 localstemName=fileName:gsub('%..+', '')
 ifnotlocals[stemName]
-andnotvm.hasGlobalSets(state.uri, stemName)
+andnotglobalMgr.hasGlobalSets(state.uri, 'variable', stemName)
 andnotconfig.get(state.uri, 'Lua.diagnostics.globals')[stemName]
 andstemName:match'^[%a_][%w_]*$'
 andmatchKey(word, stemName) then
@@ -482,7 +483,7 @@ local function checkFieldThen(state, name, src, word, startPos, position, parent
  })
 return
 end
-ifoopandnotinfer.hasType(src,'function')then
+ifoopandnotinfer.getInfer(src):hasType'function' then
 return
 end
 localliteral=guide.getLiteral(value)
@@ -584,17 +585,17 @@ end
 ---@async
 localfunctioncheckGlobal(state, word, startPos, position, parent, oop, results)
 locallocals=guide.getVisibleLocals(state.ast, position)
-localglobals=vm.getGlobalSets(state.uri, '*')
+localglobals=globalMgr.getGlobalSets(state.uri, 'variable')
 checkFieldOfRefs(globals, state, word, startPos, position, parent, oop, results, locals, 'global')
 end
 
 ---@async
 localfunctioncheckField(state, word, start, position, parent, oop, results)
 ifparent.tag=='_ENV' orparent.special=='_G' then
-localglobals=vm.getGlobalSets(state.uri, '*')
+localglobals=globalMgr.getGlobalSets(state.uri, 'variable')
 checkFieldOfRefs(globals, state, word, start, position, parent, oop, results)
 else
-localrefs=vm.getRefs(parent, '*')
+localrefs=vm.getFields(parent)
 checkFieldOfRefs(refs, state, word, start, position, parent, oop, results)
 end
 end
@@ -1106,7 +1107,7 @@ local function checkTypingEnum(state, position, defs, str, results)
 localenums= {}
 for_, definipairs(defs) do
 ifdef.type=='doc.type.string'
-ordef.type=='doc.resume' then
+ordef.type=='doc.type.integer' then
 enums[#enums+1] = {
 label=def[1],
 description=def.commentanddef.comment.text,
@@ -1312,20 +1313,20 @@ function (%s)\
 end"):format(table.concat(args, ', '))
 end
 
-localfunctionpushCallEnumsAndFuncs(defs)
+localfunctionpushCallEnumsAndFuncs(source)
+localdefs=vm.getDefs(source)
 localresults= {}
 for_, definipairs(defs) do
-ifdef.type=='doc.type.string'
-ordef.type=='doc.resume' then
+ifdef.type=='doc.type.string' then
 results[#results+1] = {
-label=def[1],
+label=util.viewLiteral(def[1]),
 description=def.comment,
 kind=define.CompletionItemKind.EnumMember,
  }
 end
 ifdef.type=='doc.type.function' then
 results[#results+1] = {
-label=infer.viewDocFunction(def),
+label=infer.getInfer(def):view(),
 description=def.comment,
 kind=define.CompletionItemKind.Function,
 insertText=buildInsertDocFunction(def),
@@ -1354,17 +1355,17 @@ local function getCallEnumsAndFuncs(source, index, oop, call)
 for_, docinipairs(source.bindDocs) do
 ifdoc.type=='doc.param'
 anddoc.param[1] ==arg[1] then
-returnpushCallEnumsAndFuncs(vm.getDefs(doc.extends))
+returnpushCallEnumsAndFuncs(doc.extends)
 elseifdoc.type=='doc.vararg'
 andarg.type=='...' then
-returnpushCallEnumsAndFuncs(vm.getDefs(doc.vararg))
+returnpushCallEnumsAndFuncs(doc.vararg)
 end
 end
 end
 ifsource.type=='doc.type.function' then
 localarg=source.args[index]
 ifargandarg.extendsthen
-returnpushCallEnumsAndFuncs(vm.getDefs(arg.extends))
+returnpushCallEnumsAndFuncs(arg.extends)
 end
 end
 ifsource.type=='doc.field.name' then
@@ -1400,7 +1401,7 @@ local function getCallEnumsAndFuncs(source, index, oop, call)
 ifeventNameandeventName==myEventNamethen
 localdocFunc=doc.extends.types[1].args[2].extends.types[1]
 results[#results+1] = {
-label=infer.viewDocFunction(docFunc),
+label=infer.getInfer(docFunc):view(),
 description=doc.comment,
 kind=define.CompletionItemKind.Function,
 insertText=buildInsertDocFunction(docFunc),
@@ -1520,7 +1521,7 @@ local function tryTable(state, position, results)
 ifsource.type~='table' then
 tbl=source.parent
 end
-localdefs=vm.getDefs(tbl, '*')
+localdefs=vm.getFields(tbl)
 for_, fieldinipairs(defs) do
 localname=guide.getKeyName(field)
 ifnameandnotmark[name] then
@@ -1635,19 +1636,20 @@ local function tryluaDocBySource(state, position, source, results)
 ifsource.type=='doc.extends.name' then
 ifsource.parent.type=='doc.class' then
 localused= {}
-for_, docinipairs(vm.getDocDefines(state.uri, '*')) do
-ifdoc.type=='doc.class.name'
-anddoc.parent~=source.parent
-andnotused[doc[1]]
-andmatchKey(source[1], doc[1]) then
-used[doc[1]] =true
+for_, docinipairs(vm.getDocSets(state.uri)) do
+localname=doc.type=='doc.class' anddoc.class[1]
+ifname
+andname~=source.parent.class[1]
+andnotused[name]
+andmatchKey(source[1], name) then
+used[name] =true
 results[#results+1] = {
-label=doc[1],
+label=name,
 kind=define.CompletionItemKind.Class,
-textEdit=doc[1]:find'[^%w_]' and {
+textEdit=name:find'[^%w_]' and {
 start=source.start,
 finish=position,
-newText=doc[1],
+newText=name,
  },
  }
 end
@@ -1656,19 +1658,20 @@ local function tryluaDocBySource(state, position, source, results)
 returntrue
 elseifsource.type=='doc.type.name' then
 localused= {}
-for_, docinipairs(vm.getDocDefines(state.uri, '*')) do
-if (doc.type=='doc.class.name' ordoc.type=='doc.alias.name')
-anddoc.parent~=source.parent
-andnotused[doc[1]]
-andmatchKey(source[1], doc[1]) then
-used[doc[1]] =true
+for_, docinipairs(vm.getDocSets(state.uri)) do
+localname= (doc.type=='doc.class' anddoc.class[1])
+or (doc.type=='doc.alias' anddoc.alias[1])
+ifname
+andnotused[name]
+andmatchKey(source[1], name) then
+used[name] =true
 results[#results+1] = {
-label=doc[1],
+label=name,
 kind=define.CompletionItemKind.Class,
-textEdit=doc[1]:find'[^%w_]' and {
+textEdit=name:find'[^%w_]' and {
 start=source.start,
 finish=position,
-newText=doc[1],
+newText=name,
  },
  }
 end
@@ -1734,17 +1737,17 @@ end
 
 localfunctiontryluaDocByErr(state, position, err, docState, results)
 iferr.type=='LUADOC_MISS_CLASS_EXTENDS_NAME' then
-for_, docinipairs(vm.getDocDefines(state.uri, '*')) do
-ifdoc.type=='doc.class.name'
-anddoc.parent~=docStatethen
+for_, docinipairs(vm.getDocSets(state.uri)) do
+ifdoc.type=='doc.class'
+anddoc.class[1]~=docState.class[1]then
 results[#results+1] = {
-label=doc[1],
+label=doc.class[1],
 kind=define.CompletionItemKind.Class,
  }
 end
 end
 elseiferr.type=='LUADOC_MISS_TYPE_NAME' then
-for_, docinipairs(vm.getDocDefines(state.uri, '*')) do
+for_, docinipairs(vm.getDocSets(state.uri)) do
 if (doc.type=='doc.class.name' ordoc.type=='doc.alias.name') then
 results[#results+1] = {
 label=doc[1],

script/core/definition.lua

@@ -152,7 +152,10 @@ return function (uri, offset)
 gotoCONTINUE
 end
 else
-ifguide.isLiteral(src) andsrc.type~='function' then
+ifguide.isLiteral(src)
+andsrc.type~='function'
+andsrc.type~='doc.type.function'
+andsrc.type~='doc.type.table' then
 gotoCONTINUE
 end
 end

script/core/diagnostics/circle-doc-class.lua

@@ -39,7 +39,7 @@ return function (uri, callback)
 end
 ifnotmark[newName] then
 mark[newName] =true
-localdocs=vm.getDocDefines(uri, newName)
+localdocs=vm.getDocSets(uri, newName)
 for_, otherDocinipairs(docs) do
 ifotherDoc.type=='doc.class.name' then
 list[#list+1] =otherDoc.parent

script/core/diagnostics/duplicate-doc-class.lua

@@ -18,7 +18,7 @@ return function (uri, callback)
 ifdoc.type=='doc.alias' then
 localname=guide.getKeyName(doc)
 ifnotcache[name] then
-localdocs=vm.getDocDefines(uri, name)
+localdocs=vm.getDocSets(uri, name)
 cache[name] = {}
 for_, otherDocinipairs(docs) do
 ifotherDoc.type=='doc.class.name'

script/core/diagnostics/type-check.lua

@@ -17,8 +17,8 @@ local typeNameMap = {
  ['doc.class.name'] =true,
  ['doc.alias.name'] =true,
  ['doc.type.name'] =true,
- ['doc.type.string'] =true,
- ['doc.resume'] =true,
+ ['doc.type.string'] =true,
+ ['doc.type.integer']=true,
 
 }
 
@@ -37,10 +37,10 @@ local function isTable(name)
 end
 
 localfunctionisUserDefineClass(uri, name)
-ifvm.isBuiltinType(name) then
+ifguide.isBasicType(name) then
 returnfalse
 else
-localdefs=vm.getDocDefines(uri, name)
+localdefs=vm.getDocSets(uri, name)
 for_, vinipairs(defs) do
 ifv.type=='doc.class.name' then
 returntrue
@@ -54,7 +54,7 @@ local function isClassOralias(typeName)
 ifnottypeNamethen
 returnfalse
 elseiftypeNameMap[typeName]
-orvm.isBuiltinType(typeName) then
+orguide.isBasicType(typeName) then
 returntrue
 else
 returnfalse
@@ -99,7 +99,7 @@ end
 -- if not type[1] then
 -- return
 -- end
--- local docDefs = vm.getDocDefines(type[1])
+-- local docDefs = vm.getDocSets(type[1])
 -- for _, doc in ipairs(docDefs) do
 -- if doc.parent
 -- and doc.parent.type == 'doc.class'
@@ -119,7 +119,7 @@ end
 localfunctionaddFatherClass(uri, infers)
 forkinpairs(infers) do
 iftype(k) =='string' then
-localdocDefs=vm.getDocDefines(uri, k)
+localdocDefs=vm.getDocSets(uri, k)
 for_, docinipairs(docDefs) do
 ifdoc.parent
 anddoc.parent.type=='doc.class'

script/core/diagnostics/undefined-doc-class.lua

@@ -23,7 +23,7 @@ return function (uri, callback)
 end
 for_, extinipairs(doc.extends) do
 localname=ext[1]
-localdocs=vm.getDocDefines(uri, name)
+localdocs=vm.getDocSets(uri, name)
 ifcache[name] ==nilthen
 cache[name] =false
 for_, otherDocinipairs(docs) do

script/core/diagnostics/undefined-doc-name.lua

@@ -35,7 +35,7 @@ return function (uri, callback)
 ifname=='...' then
 return
 end
-ifvm.isDocDefined(uri, name)
+if#vm.getDocSets(uri, name)>0
 orhasNameOfGeneric(name, source) then
 return
 end

script/core/hover/description.lua

@@ -158,8 +158,8 @@ local function buildEnumChunk(docType, name)
 end
 localtypes= {}
 for_, tpinipairs(docType.types) do
-iftp.type~='doc.enum'
-andtp.type~='doc.resume' then
+iftp.type~='doc.string'
+andtp.type~='doc.integer' then
 types[#types+1] =tp[1]
 end
 end

script/core/semantic-tokens.lua

@@ -513,24 +513,6 @@ local Care = util.switch()
 modifieres=define.TokenModifiers.static,
  }
 end)
- : case'doc.resume'
- : call(function (source, options, results)
-ifnotoptions.annotationthen
-return
-end
-results[#results+1] = {
-start=source.start,
-finish=source.finish,
-type=define.TokenTypes.string,
-modifieres=define.TokenModifiers.static,
- }
-localrow=guide.rowColOf(source.start)
-results[#results+1] = {
-start=source.finish,
-finish=guide.positionOf(row, guide.getLineRange(options.state, row)),
-type=define.TokenTypes.comment,
- }
-end)
  : case'doc.type.function'
  : call(function (source, options, results)
 ifnotoptions.annotationthen

script/parser/guide.lua

@@ -231,6 +231,10 @@ function m.isLiteral(obj)
 ortp=='integer'
 ortp=='table'
 ortp=='function'
+ortp=='doc.type.function'
+ortp=='doc.type.table'
+ortp=='doc.type.string'
+ortp=='doc.type.integer'
 end
 
 --- 获取字面量
@@ -820,8 +824,6 @@ local isSetMap = {
  ['doc.class'] =true,
  ['doc.alias'] =true,
  ['doc.field'] =true,
- ['doc.type.function'] =true,
- ['doc.type.table'] =true,
  ['doc.class.name'] =true,
  ['doc.alias.name'] =true,
  ['doc.field.name'] =true,