update

Author: sumneko

script/core/definition.lua

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

script/vm/compiler.lua

@@ -57,30 +57,80 @@ local searchFieldMap = util.switch()
 iffield.type=='tablefield'
 orfield.type=='tableindex' then
 ifguide.getKeyName(field) ==keythen
-pushResult(m.compileNode(field))
+pushResult(field)
 end
 end
 end
 end)
  : case'global'
 ---@paramnodevm.node.global
  : call(function (node, key, pushResult)
-localglobal=globalMgr.getGlobal('variable', node.name, key)
-ifglobalthen
-pushResult(global)
+ifnode.cate=='variable' then
+localglobal=globalMgr.getGlobal('variable', node.name, key)
+ifglobalthen
+pushResult(global)
+end
+end
+ifnode.cate=='type' then
+m.getClassFields(node, key, pushResult)
 end
 end)
  : case'local'
  : call(function (node, key, pushResult)
 localsources=localID.getSources(node, key)
 ifsourcesthen
 for_, srcinipairs(sources) do
-pushResult(m.compileNode(src))
+pushResult(src)
 end
 end
 end)
  : getMap()
 
+
+functionm.getClassFields(node, key, pushResult)
+localmark= {}
+localfunctionsearchClass(class)
+localname=class.name
+ifmark[name] then
+return
+end
+mark[name] =true
+for_, setinipairs(class:getSets()) do
+ifset.type=='doc.class' then
+-- check ---@field
+localhasFounded
+for_, fieldinipairs(set.fields) do
+ifguide.getKeyName(field) ==keythen
+hasFounded=true
+pushResult(field)
+end
+end
+-- check local field and global field
+ifset.bindSourcesthen
+for_, srcinipairs(set.bindSources) do
+ifsearchFieldMap[src.type] then
+searchFieldMap[src.type](src, key, function (src)
+hasFounded=true
+pushResult(src)
+end)
+end
+end
+end
+-- look into extends(if field not found)
+ifnothasFoundedandset.extendsthen
+for_, extendinipairs(set.extends) do
+localextendType=globalMgr.getGlobal('type', extend[1])
+ifextendTypethen
+searchClass(extendType)
+end
+end
+end
+end
+end
+end
+searchClass(node)
+end
+
 localfunctiongetReturnOfFunction(func, index)
 ifnotfunc._returnsthen
 func._returns=util.defaultTable(function ()
@@ -101,8 +151,8 @@ local function getReturnOfSetMetaTable(source, args)
 m.setNode(source, m.compileNode(tbl))
 end
 ifmtthen
-m.compileByParentNode(mt, '__index', function (node)
-m.setNode(source, node)
+m.compileByParentNode(mt, '__index', function (src)
+m.setNode(source, m.compileNode(src))
 end)
 end
 returnsource._node
@@ -136,7 +186,7 @@ end
 
 ---@paramsourcevm.node
 ---@paramkeyany
----@parampushResultfun(node:vm.node)
+---@parampushResultfun(source: parser.object)
 functionm.compileByParentNode(source, key, pushResult)
 localparentNode=m.compileNode(source)
 ifnotparentNodethen
@@ -244,8 +294,8 @@ local compilerMap = util.switch()
  : case'getindex'
  : call(function (source)
 compileByLocalID(source)
-m.compileByParentNode(source.node, guide.getKeyName(source), function (node)
-m.setNode(source, node)
+m.compileByParentNode(source.node, guide.getKeyName(source), function (src)
+m.setNode(source, m.compileNode(src))
 end)
 end)
  : case'tablefield'
@@ -291,6 +341,10 @@ local compilerMap = util.switch()
 type:addGet(uri, source)
 m.setNode(source, type)
 end)
+ : case'doc.field'
+ : call(function (source)
+m.setNode(source, m.compileNode(source.extends))
+end)
  : getMap()
 
 ---@paramsourceparser.object
@@ -303,13 +357,18 @@ end
 
 ---@paramsourceparser.object
 localfunctioncompileByGlobal(source)
+ifsource.type=='global' then
+m.setNode(source, source)
+return
+end
 ifsource._globalNodethen
 m.setNode(source, source._globalNode)
 for_, setinipairs(source._globalNode:getSets()) do
 ifset.valuethen
 m.setNode(source, m.compileNode(set.value))
 end
 end
+return
 end
 end
 
@@ -320,8 +379,8 @@ function m.compileNode(source)
 returnsource._node
 end
 source._node=false
-compileByNode(source)
 compileByGlobal(source)
+compileByNode(source)
 
 localMgr.subscribeLocal(source, source._node)
 

script/vm/getDef.lua

@@ -85,13 +85,23 @@ local searchFieldMap = util.switch()
 end
 end)
  : case'global'
+---@paramnodevm.node
+---@paramkeystring
  : call(function (node, key, pushResult)
-localnewGlobal=globalMgr.getGlobal('variable', node.name, key)
-ifnotnewGlobalthen
-return
+ifnode.cate=='variable' then
+localnewGlobal=globalMgr.getGlobal('variable', node.name, key)
+ifnewGlobalthen
+for_, setinipairs(newGlobal:getSets()) do
+pushResult(set)
+end
+end
 end
-for_, setinipairs(newGlobal:getSets()) do
-pushResult(set)
+ifnode.cate=='type' then
+compiler.getClassFields(node, key, function (field)
+iffield.type=='doc.field' then
+pushResult(field.field)
+end
+end)
 end
 end)
  : case'local'

script/vm/global-manager.lua

@@ -162,7 +162,7 @@ function m.declareGlobal(cate, name, uri)
 localkey=cate..'|' ..name
 m.globalSubs[uri][key] =true
 ifnotm.globals[key] then
-m.globals[key] =globalBuilder(name)
+m.globals[key] =globalBuilder(name, cate)
 end
 returnm.globals[key]
 end

script/vm/global.lua

@@ -8,6 +8,7 @@ local util = require 'utility'
 ---@fieldlinkstable<uri, vm.node.global.link>
 ---@fieldsetsCacheparser.object[]
 ---@fieldgetsCacheparser.object[]
+---@fieldcatevm.global.cate
 localmt= {}
 mt.__index=mt
 mt.type='global'
@@ -70,10 +71,12 @@ function mt:isAlive()
 returnnext(self.links) ~=nil
 end
 
+---@paramcatevm.global.cate
 ---@returnvm.node.global
-returnfunction (name)
+returnfunction (name, cate)
 returnsetmetatable({
 name=name,
+cate=cate,
 links=util.defaultTable(function ()
 return {
 sets= {},

test/definition/bug.lua

@@ -262,7 +262,7 @@ TEST [[
 ---@type B
 local t
 
-local <!<?v?>!> = t.x
+t.<?x?>
 ]]
 
 TEST[[
@@ -274,7 +274,7 @@ TEST [[
 ---@type B
 local t
 
-local <!<?v?>!> = t.x
+t.<?x?>
 ]]
 
 TEST[[
@@ -286,7 +286,7 @@ function A:x() end
 ---@class B: A
 local B
 
-function B:<!x!>() end
+<!function B:x() end!>
 
 ---@type B
 local t
@@ -298,7 +298,7 @@ TEST [[
 ---@class A
 local A
 
-function A:<!x!>() end
+<!function A:x() end!>
 
 ---@class B: A
 local B

test/definition/function.lua

@@ -24,6 +24,6 @@ end
 ]]
 
 TEST[[
-local <!f!> = function () end
+local <!f!> = <!function () end!>
 <?f?>()
 ]]