stash

Author: sumneko

script/parser/guide.lua

@@ -433,7 +433,7 @@ function m.getRoot(obj)
     error('guide.getRoot overstack')
 end
 
----@param obj parser.object
+---@param obj parser.object | { uri: uri }
 ---@return uri
 function m.getUri(obj)
     if obj.uri then

script/vm/compiler.lua

@@ -59,15 +59,27 @@ local function bindDocs(source)
     return false
 end
 
----@param source parser.object
+---@param source parser.object | vm.variable
 ---@param key any
 ---@param pushResult fun(res: parser.object, markDoc?: boolean)
 local function searchFieldByLocalID(source, key, pushResult)
     local fields
     if key then
-        fields = vm.getVariableSets(source, key)
+        if source.type == 'variable' then
+            ---@cast source vm.variable
+            fields = source:getSets(key)
+        else
+            ---@cast source parser.object
+            fields = vm.getVariableSets(source, key)
+        end
     else
-        fields = vm.getVariableFields(source, false)
+        if source.type == 'variable' then
+            ---@cast source vm.variable
+            fields = source:getFields(false)
+        else
+            ---@cast source parser.object
+            fields = vm.getVariableFields(source, false)
+        end
     end
     if not fields then
         return
@@ -619,7 +631,7 @@ local function bindAs(source)
     return false
 end
 
----@param source parser.object
+---@param source parser.object | vm.variable
 ---@param key? string|vm.global
 ---@param pushResult fun(source: parser.object)
 function vm.compileByParentNode(source, key, pushResult)
@@ -1259,22 +1271,6 @@ local compilerSwitch = util.switch()
                     return
                 end
             end
-            ---@cast key string
-            vm.compileByParentNode(source.node, key, function (src)
-                if src.value then
-                    if bindDocs(src) then
-                        vm.setNode(source, vm.compileNode(src))
-                    elseif src.value.type ~= 'nil' then
-                        vm.setNode(source, vm.compileNode(src.value))
-                        local node = vm.getNode(src)
-                        if node then
-                            vm.setNode(source, node)
-                        end
-                    end
-                else
-                    vm.setNode(source, vm.compileNode(src))
-                end
-            end)
         end
     end)
     : case 'setglobal'
@@ -1764,6 +1760,34 @@ local compilerSwitch = util.switch()
             end
         end
     end)
+    : case 'variable'
+    ---@param variable vm.variable
+    : call(function (variable)
+        if variable == vm.getVariable(variable.base) then
+            vm.setNode(variable, vm.compileNode(variable.base))
+            return
+        end
+        local parentVariable = variable:getParent()
+        local fieldName      = variable:getFieldName()
+        if not parentVariable or not fieldName then
+            return
+        end
+        vm.compileByParentNode(parentVariable, fieldName, function (src)
+            if src.value then
+                if bindDocs(src) then
+                    vm.setNode(variable, vm.compileNode(src))
+                elseif src.value.type ~= 'nil' then
+                    vm.setNode(variable, vm.compileNode(src.value))
+                    local node = vm.getNode(src)
+                    if node then
+                        vm.setNode(variable, node)
+                    end
+                end
+            else
+                vm.setNode(variable, vm.compileNode(src))
+            end
+        end)
+    end)
 
 ---@param source parser.object
 local function compileByNode(source)

script/vm/variable.lua

@@ -4,6 +4,7 @@ local guide = require 'parser.guide'
 local vm    = require 'vm.vm'
 
 ---@class vm.variable
+---@field uri uri
 ---@field root parser.object
 ---@field id string
 ---@field base parser.object
@@ -18,6 +19,7 @@ mt.type = 'variable'
 local function createVariable(root, id)
     local variable = setmetatable({
         root = root,
+        uri  = root.uri,
         id   = id,
         sets = {},
         gets = {},
@@ -175,6 +177,60 @@ function mt:getCodeName()
     return name
 end
 
+---@return vm.variable?
+function mt:getParent()
+    local parentID = self.id:match('^(.+)' .. vm.ID_SPLITE)
+    if not parentID then
+        return nil
+    end
+    return self.root._variableNodes[parentID]
+end
+
+---@return string?
+function mt:getFieldName()
+    return self.id:match(vm.ID_SPLITE .. '(.-)$')
+end
+
+---@param key?   string
+function mt:getSets(key)
+    if not key then
+        return self.sets
+    end
+    local id = self.id .. vm.ID_SPLITE .. key
+    local variable = self.root._variableNodes[id]
+    return variable.sets
+end
+
+---@param includeGets boolean?
+function mt:getFields(includeGets)
+    local id   = self.id
+    local root = self.root
+    -- TODO：optimize
+    local clock = os.clock()
+    local fields = {}
+    for lid, variable in pairs(root._variableNodes) do
+        if  lid ~= id
+        and util.stringStartWith(lid, id)
+        and lid:sub(#id + 1, #id + 1) == vm.ID_SPLITE
+        -- only one field
+        and not lid:find(vm.ID_SPLITE, #id + 2) then
+            for _, src in ipairs(variable.sets) do
+                fields[#fields+1] = src
+            end
+            if includeGets then
+                for _, src in ipairs(variable.gets) do
+                    fields[#fields+1] = src
+                end
+            end
+        end
+    end
+    local cost = os.clock() - clock
+    if cost > 1.0 then
+        log.warn('variable-id getFields takes %.3f seconds', cost)
+    end
+    return fields
+end
+
 ---@param source parser.object
 ---@param base parser.object
 function compileVariables(source, base)
@@ -283,38 +339,11 @@ end
 ---@param includeGets boolean
 ---@return parser.object[]?
 function vm.getVariableFields(source, includeGets)
-    local id = vm.getVariableID(source)
-    if not id then
-        return nil
-    end
-    local root = guide.getRoot(source)
-    if not root._variableNodes then
+    local variable = vm.getVariable(source)
+    if not variable then
         return nil
     end
-    -- TODO：optimize
-    local clock = os.clock()
-    local fields = {}
-    for lid, variable in pairs(root._variableNodes) do
-        if  lid ~= id
-        and util.stringStartWith(lid, id)
-        and lid:sub(#id + 1, #id + 1) == vm.ID_SPLITE
-        -- only one field
-        and not lid:find(vm.ID_SPLITE, #id + 2) then
-            for _, src in ipairs(variable.sets) do
-                fields[#fields+1] = src
-            end
-            if includeGets then
-                for _, src in ipairs(variable.gets) do
-                    fields[#fields+1] = src
-                end
-            end
-        end
-    end
-    local cost = os.clock() - clock
-    if cost > 1.0 then
-        log.warn('variable-id getFields takes %.3f seconds', cost)
-    end
-    return fields
+    return variable:getFields(includeGets)
 end
 
 ---@param source parser.object