整理代码

3 files changed, 148 insertions, 63 deletions

diff --git a/server/src/files/file.lua b/server/src/files/file.lua
index deaea8ba..61f62a00 100644
--- a/server/src/files/file.lua
+++ b/server/src/files/file.lua
@@ -3,11 +3,15 @@ local mt = {}
 mt.__index = mt
 mt.type = 'file'
 mt._uri = ''
+mt._oldText = ''
 mt._text = ''
 mt._version = -1
+mt._vmCost = 0.0
+mt._lineCost = 0.0
 
 ---@param buf string
 function mt:setText(buf)
+    self._oldText = self._text
     self._text = buf
 end
 
@@ -16,6 +20,15 @@ function mt:getText()
     return self._text
 end
 
+---@return string
+function mt:getOldText()
+    return self._oldText
+end
+
+function mt:clearOldText()
+    self._oldText = nil
+end
+
 ---@param version integer
 function mt:setVersion(version)
     self._version = version
@@ -38,9 +51,23 @@ function mt:remove()
     end
 end
 
+---@return boolean
+function mt:isRemoved()
+    return self._removed == true
+end
+
 ---@param vm VM
-function mt:saveVM(vm)
+---@param version integer
+---@param cost number
+function mt:saveVM(vm, version, cost)
+    if self._vm then
+        self._vm:remove()
+    end
     self._vm = vm
+    if vm then
+        vm:setVersion(version)
+    end
+    self._vmCost = cost
 end
 
 ---@return VM
@@ -48,6 +75,11 @@ function mt:getVM()
     return self._vm
 end
 
+---@return number
+function mt:getVMCost()
+    return self._vmCost
+end
+
 function mt:removeVM()
     if not self._vm then
         return
@@ -56,17 +88,39 @@ function mt:removeVM()
     self._vm = nil
 end
 
+---@param lines table
+---@param cost number
+function mt:saveLines(lines, cost)
+    self._lines = lines
+    self._lineCost = cost
+end
+
+---@return table
+function mt:getLines()
+    return self._lines
+end
+
 ---@return file
 function mt:getParent()
     return self._parent
 end
 
 ---@param uri uri
+function mt:addChild(uri)
+    self._child[uri] = true
+end
+
+---@param uri uri
 function mt:removeChild(uri)
     self._child[uri] = nil
 end
 
 ---@param uri uri
+function mt:addParent(uri)
+    self._parent[uri] = true
+end
+
+---@param uri uri
 function mt:removeParent(uri)
     self._parent[uri] = nil
 end
@@ -79,6 +133,16 @@ function mt:eachParent()
     return pairs(self._parent)
 end
 
+---@param err table
+function mt:setAstErr(err)
+    self._astErr = err
+end
+
+---@return table
+function mt:getAstErr()
+    return self._astErr
+end
+
 ---@param uri string
 return function (uri)
     local self = setmetatable({
diff --git a/server/src/service.lua b/server/src/service.lua
index ef601393..f06473e0 100644
--- a/server/src/service.lua
+++ b/server/src/service.lua
@@ -369,10 +369,11 @@ function mt:_markCompiled(uri, compiled)
 end
 
 ---@param file file
+---@return table
 function mt:compileAst(file)
-    local ast, err = parser:ast(file.text, 'lua', config.config.runtime.version)
+    local ast, err = parser:ast(file:getText(), 'lua', config.config.runtime.version)
     if ast then
-        file.astErr = err
+        file:setAstErr(err)
     else
         if type(err) == 'string' then
             local message = lang.script('PARSER_CRASH', err)
@@ -444,12 +445,12 @@ function mt:compileVM(uri)
 
     local clock = os.clock()
     local ast = self:compileAst(file)
-    local version = file.version
-    file.astCost = os.clock() - clock
-    if file.astCost > 0.1 then
-        log.warn(('Compile Ast[%s] takes [%.3f] sec, size [%.3f]kb'):format(uri, file.astCost, #file.text / 1000))
+    local version = file:getVersion()
+    local astCost = os.clock() - clock
+    if astCost > 0.1 then
+        log.warn(('Compile Ast[%s] takes [%.3f] sec, size [%.3f]kb'):format(uri, astCost, #file:getText() / 1000))
     end
-    file.oldText = nil
+    file:clearOldText()
 
     self:_clearChainNode(file, uri)
     self:_clearGlobal(uri)
@@ -459,13 +460,10 @@ function mt:compileVM(uri)
     if vm then
         CachedVM[vm] = true
     end
-    if self:isDeadText(uri) or file.removed then
-        if vm then
-            vm:remove()
-        end
-        return nil
-    end
-    if version ~= file.version then
+    if self:isDeadText(uri)
+        or file:isRemoved()
+        or version ~= file:getVersion()
+    then
         if vm then
             vm:remove()
         end
@@ -480,21 +478,17 @@ function mt:compileVM(uri)
         end
         return nil
     end
-    if file.vm then
-        file.vm:remove()
-    end
-    file.vm = vm
-    file.vmCost = os.clock() - clock
-    file.vmVersion = version
+    file:saveVM(vm, os.clock() - clock, version)
 
     local clock = os.clock()
-    file.lines = parser:lines(file.text, 'utf8')
-    file.lineCost = os.clock() - clock
+    local lines = parser:lines(file:getText(), 'utf8')
+    local lineCost = os.clock() - clock
+    file:saveLines(lines, lineCost)
 
-    if file.vmCost > 0.2 then
-        log.debug(('Compile VM[%s] takes: %.3f sec'):format(uri, file.vmCost))
+    if file:getVMCost() > 0.2 then
+        log.debug(('Compile VM[%s] takes: %.3f sec'):format(uri, file:getVMCost()))
     end
-    if not file.vm then
+    if not vm then
         error(err)
     end
 
@@ -506,28 +500,32 @@ function mt:compileVM(uri)
     return file
 end
 
+---@param uri uri
 function mt:doDiagnostics(uri)
     if not self._needDiagnostics[uri] then
         return
     end
     local name = 'textDocument/publishDiagnostics'
-    local obj = self._file[uri]
-    if not obj or obj.removed or not obj.vm or obj.vm:isRemoved() then
+    local file = self._files:get(uri)
+    if not file
+        or file:isRemoved()
+        or not file:getVM()
+        or file:getVM():isRemoved() then
         self._needDiagnostics[uri] = nil
         self:clearDiagnostics(uri)
         return
     end
     local data = {
         uri   = uri,
-        vm    = obj.vm,
-        lines = obj.lines,
-        version = obj.vmVersion,
+        vm    = file:getVM(),
+        lines = file:getLines(),
+        version = file:getVM():getVersion(),
     }
     local res = self:_callMethod(name, data)
     if self:isDeadText(uri) then
         return
     end
-    if obj.version ~= data.version then
+    if file:getVM():getVersion() ~= data.version then
         return
     end
     if self._needDiagnostics[uri] then
@@ -545,54 +543,60 @@ function mt:doDiagnostics(uri)
     end
 end
 
+---@param uri uri
+---@return file
 function mt:getFile(uri)
-    return self._file[uri]
+    return self._files:get(uri)
 end
 
+---@param uri uri
+---@return VM
+---@return table
+---@return string
 function mt:getVM(uri)
-    local obj = self._file[uri]
-    if not obj then
+    local file = self._files:get(uri)
+    if not file then
         return nil
     end
-    return obj.vm, obj.lines, obj.text
+    return file:getVM(), file:getLines(), file:getText()
 end
 
+---@param uri uri
+---@return string
+---@return string
 function mt:getText(uri)
-    local obj = self._file[uri]
-    if not obj then
+    local file = self._files:get(uri)
+    if not file then
         return nil
     end
-    return obj.text, obj.oldText
+    return file:getText(), file:getOldText()
 end
 
+---@param uri uri
+---@return table
 function mt:getAstErrors(uri)
-    local obj = self._file[uri]
-    if not obj then
+    local file = self._files:get(uri)
+    if not file then
         return nil
     end
-    return obj.astErr
+    return file:getAstErr()
 end
 
+---@param child uri
+---@param parent uri
 function mt:compileChain(child, parent)
-    local parentObj = self._file[parent]
-    local childObj = self._file[child]
+    local parentFile = self._files:get(parent)
+    local childFile = self._files:get(child)
 
-    if not parentObj or not childObj then
+    if not parentFile or not childFile then
         return
     end
-    if parentObj == childObj then
+    if parentFile == childFile then
         return
     end
 
-    if not parentObj.child then
-        parentObj.child = {}
-    end
-    parentObj.child[child] = true
-
-    if not childObj.parent then
-        childObj.parent = {}
-    end
-    childObj.parent[parent] = true
+    parentFile:addChild(child)
+    childFile:addParent(parent)
 end
 
 function mt:checkWorkSpaceComplete()
@@ -722,11 +726,12 @@ function mt:_testMemory()
     local cachedVM = 0
     local cachedSource = 0
     local cachedFunction = 0
-    for _, obj in pairs(self._file) do
-        if obj.vm and not obj.vm:isRemoved() then
+    for _, file in self._files:eachFile() do
+        local vm = file:getVM()
+        if vm and not vm:isRemoved() then
             cachedVM = cachedVM + 1
-            cachedSource = cachedSource + #obj.vm.sources
-            cachedFunction = cachedFunction + #obj.vm.funcs
+            cachedSource = cachedSource + #vm.sources
+            cachedFunction = cachedFunction + #vm.funcs
         end
     end
     local aliveVM = 0
@@ -841,9 +846,12 @@ function mt:_testFindDeadValues()
     end
     self._testHasFoundDeadValues = true
 
+    log.debug('Start find dead values, may takes few seconds...')
+
     local mark = {}
     local stack = {}
     local count = 0
+    local clock = os.clock()
     local function push(info)
         stack[#stack+1] = info
     end
@@ -855,7 +863,7 @@ function mt:_testFindDeadValues()
         log.debug(uri, table.concat(stack, '->'))
     end
     local function scan(name, tbl)
-        if count > 100 then
+        if count > 100 or os.clock() - clock > 5.0 then
             return
         end
         if type(tbl) ~= 'table' then
@@ -874,6 +882,10 @@ function mt:_testFindDeadValues()
             if not tbl:getSource() then
                 showStack(tbl.uri)
             end
+        elseif tbl.type == 'files' then
+            for k, v in tbl:eachFile() do
+                scan(k, v)
+            end
         else
             for k, v in pairs(tbl) do
                 scan(k, v)
@@ -881,7 +893,7 @@ function mt:_testFindDeadValues()
         end
         pop()
     end
-    scan('root', self._file)
+    scan('root', self._files)
 end
 
 function mt:onTick()
@@ -929,8 +941,6 @@ end
 
 return function ()
     local session = setmetatable({
-        _file = {},
-        _fileCount = 0,
         _needCompile = {},
         _needDiagnostics = {},
         _clock = -100,
diff --git a/server/src/vm/manager.lua b/server/src/vm/manager.lua
index 5f6a9b6a..b9762d2e 100644
--- a/server/src/vm/manager.lua
+++ b/server/src/vm/manager.lua
@@ -2,5 +2,16 @@
 local mt = {}
 mt.__index = mt
 mt.type = 'vm'
+mt._version = -1
+
+---@param version integer
+function mt:setVersion(version)
+    self._version = version
+end
+
+---@return integer
+function mt:getVersion()
+    return self._version
+end
 
 return mt