Merge branch 'master' into master

Author: sumneko

changelog.md

@@ -2,7 +2,12 @@
 
 ## Unreleased
 <!-- Add all new changes here. They will be moved under a version at release -->
+* `CHG` Always track symbol-links
 * `CHG` Modified the `ResolveRequire` function to pass the source URI as a third argument.
+* `CHG` Improved the output of test failures during development
+* `FIX` Fix type inference for bitwise operators (`<<`, `>>`, `&`, `|`, `~`) on integer variables
+* `FIX` Fix constant value computation for chained bitwise expressions in hover tooltips
+* `FIX` Support Lua 5.5 prefix local attributes such as `local <close>x` and `local <const>x`
 * `FIX` Correct `os` and `io` meta return types.
 
 ## 3.17.1

script/files.lua

@@ -80,39 +80,7 @@ end
 ---@param uri uri
 ---@return uri
 function m.getRealUri(uri)
-    if platform.os ~= 'windows' then
-        return furi.normalize(uri)
-    end
-    if not furi.isValid(uri) then
-        return uri
-    end
-    local filename = furi.decode(uri)
-    -- normalize uri
-    uri = furi.encode(filename)
-    local path = fs.path(filename)
-    local suc, exists = pcall(fs.exists, path)
-    if not suc or not exists then
-        return uri
-    end
-    local suc, res = pcall(fs.canonical, path)
-    if not suc then
-        return uri
-    end
-    filename = res:string()
-    local ruri = furi.encode(filename)
-    if uri == ruri then
-        return ruri
-    end
-    local real = getRealParent(path:parent_path()) / res:filename()
-    ruri = furi.encode(real:string())
-    if uri == ruri then
-        return ruri
-    end
-    if not uriMap[uri] then
-        uriMap[uri] = true
-        log.warn(('Fix real file uri: %s -> %s'):format(uri, ruri))
-    end
-    return ruri
+    return furi.normalize(uri)
 end
 
 --- 打开文件

script/parser/compile.lua

@@ -652,7 +652,8 @@ local function expectAssign(isAction)
     return false
 end
 
-local function parseLocalAttrs()
+---@param kind? '"prefix"'|'"suffix"'
+local function parseLocalAttrs(kind)
     local attrs
     while true do
         skipSpace()
@@ -672,6 +673,7 @@ local function parseLocalAttrs()
             parent = attrs,
             start  = getPosition(Tokens[Index], 'left'),
             finish = getPosition(Tokens[Index], 'right'),
+            kind   = kind or 'suffix',
         }
         attrs[#attrs+1] = attr
         Index = Index + 2
@@ -725,6 +727,20 @@ local function parseLocalAttrs()
     return attrs
 end
 
+local function mergeLocalAttrs(attrsBefore, attrsAfter)
+    if not attrsBefore then
+        return attrsAfter
+    end
+    if not attrsAfter then
+        return attrsBefore
+    end
+    for i = 1, #attrsAfter do
+        attrsBefore[#attrsBefore + 1] = attrsAfter[i]
+    end
+    attrsBefore.finish = attrsAfter[#attrsAfter].finish
+    return attrsBefore
+end
+
 ---@param obj table
 local function createLocal(obj, attrs)
     obj.type   = 'local'
@@ -951,6 +967,79 @@ local function hasAttr(attrs, attrName)
     return false
 end
 
+local function hasAttrKind(attrs, attrName, attrKind)
+    if not attrs then
+        return false
+    end
+    for i = 1, #attrs do
+        if attrs[i][1] == attrName and attrs[i].kind == attrKind then
+            return true
+        end
+    end
+    return false
+end
+
+local function checkLocalCloseList(n1, n2, nrest)
+    if State.version ~= 'Lua 5.4' and State.version ~= 'Lua 5.5' then
+        return
+    end
+
+    if State.version == 'Lua 5.5' and hasAttrKind(n1 and n1.attrs, 'close', 'prefix') then
+        local extra
+        if n2 and not n2.attrs then
+            extra = n2
+        elseif nrest then
+            for i = 1, #nrest do
+                if not nrest[i].attrs then
+                    extra = nrest[i]
+                    break
+                end
+            end
+        end
+        if extra then
+            pushError {
+                type   = 'MULTI_CLOSE',
+                start  = extra.start,
+                finish = extra.finish,
+            }
+            return
+        end
+    end
+
+    local function collectCloseAttrs(node, list)
+        local attrs = node and node.attrs
+        if not attrs then
+            return
+        end
+        for i = 1, #attrs do
+            local a = attrs[i]
+            if a[1] == 'close' then
+                list[#list + 1] = a
+            end
+        end
+    end
+
+    local closeList = {}
+    collectCloseAttrs(n1, closeList)
+    if n2 then
+        collectCloseAttrs(n2, closeList)
+    end
+    if nrest then
+        for i = 1, #nrest do
+            collectCloseAttrs(nrest[i], closeList)
+        end
+    end
+
+    if #closeList > 1 then
+        local second = closeList[2]
+        pushError {
+            type   = 'MULTI_CLOSE',
+            start  = second.start,
+            finish = second.finish,
+        }
+    end
+end
+
 local function resolveLable(label, obj)
     if not label.ref then
         label.ref = {}
@@ -3208,43 +3297,8 @@ local function parseMultiVars(n1, parser, isLocal)
         end
     end
 
-    do
-        -- Lua 5.4: only one <close> attribute allowed across a local declaration
-        -- Lua 5.5: multiple <close> are allowed
-        if State.version == 'Lua 5.4' then
-            local function collectCloseAttrs(node, list)
-                local attrs = node and node.attrs
-                if not attrs then
-                    return
-                end
-                for i = 1, #attrs do
-                    local a = attrs[i]
-                    if a[1] == 'close' then
-                        list[#list + 1] = a
-                    end
-                end
-            end
-
-            local closeList = {}
-            collectCloseAttrs(n1, closeList)
-            if n2 then
-                collectCloseAttrs(n2, closeList)
-            end
-            if nrest then
-                for i = 1, #nrest do
-                    collectCloseAttrs(nrest[i], closeList)
-                end
-            end
-
-            if #closeList > 1 then
-                local second = closeList[2]
-                pushError {
-                    type   = 'MULTI_CLOSE',
-                    start  = second.start,
-                    finish = second.finish,
-                }
-            end
-        end
+    if isLocal then
+        checkLocalCloseList(n1, n2, nrest)
     end
 
     if v2 and not n2 then
@@ -3343,13 +3397,30 @@ local function parseLocal()
     local locPos = getPosition(Tokens[Index], 'left')
     Index = Index + 2
     skipSpace()
-    local word = peekWord()
+    local attrsBefore = parseLocalAttrs('prefix')
+    if attrsBefore and State.version ~= 'Lua 5.5' then
+        pushError {
+            type    = 'UNSUPPORT_SYMBOL',
+            start   = attrsBefore.start,
+            finish  = attrsBefore.finish,
+            version = 'Lua 5.5',
+        }
+    end
+    skipSpace()
+    local word, wstart, wfinish = peekWord()
     if not word then
         missName()
         return nil
     end
 
     if word == 'function' then
+        if attrsBefore then
+            pushError {
+                type   = 'MISS_NAME',
+                start  = wstart,
+                finish = wfinish,
+            }
+        end
         local func = parseFunction('local', true)
         local name = func.name
         if name then
@@ -3373,7 +3444,9 @@ local function parseLocal()
         missName()
         return nil
     end
-    local loc = createLocal(name, parseLocalAttrs())
+    local attrsAfter = parseLocalAttrs('suffix')
+    local attrs = mergeLocalAttrs(attrsBefore, attrsAfter)
+    local loc = createLocal(name, attrs)
     loc.locPos = locPos
     loc.effect = maxinteger
     pushActionIntoCurrentChunk(loc)

script/vm/operator.lua

@@ -58,6 +58,12 @@ vm.OP_UNARY_MAP  = util.revertMap(unaryMap)
 vm.OP_BINARY_MAP = util.revertMap(binaryMap)
 vm.OP_OTHER_MAP  = util.revertMap(otherMap)
 
+---@param source parser.object
+---@return uri, vm.infer, vm.infer
+local function getOperandInfers(source)
+    return guide.getUri(source), vm.getInfer(source[1]), vm.getInfer(source[2])
+end
+
 ---@param operators parser.object[]
 ---@param op string
 ---@param value? parser.object
@@ -267,6 +273,13 @@ vm.binarySwitch = util.switch()
             end
             if node then
                 vm.setNode(source, node)
+                return
+            end
+            -- Bitwise ops on integers always produce integer
+            local uri, infer1, infer2 = getOperandInfers(source)
+            if  infer1:hasType(uri, 'integer')
+            and infer2:hasType(uri, 'integer') then
+                vm.setNode(source, vm.declareGlobal('type', 'integer'))
             end
         end
     end)
@@ -386,9 +399,7 @@ vm.binarySwitch = util.switch()
                 [1]    = a .. b,
             })
         else
-            local uri = guide.getUri(source)
-            local infer1 = vm.getInfer(source[1])
-            local infer2 = vm.getInfer(source[2])
+            local uri, infer1, infer2 = getOperandInfers(source)
             if  (
                 infer1:hasType(uri, 'integer')
             or  infer1:hasType(uri, 'number')

script/vm/value.lua

@@ -118,6 +118,7 @@ function vm.getInteger(v)
     end
     local node = vm.compileNode(v)
     local result
+    local hasNonInteger = false
     for n in node:eachObject() do
         if n.type == 'integer' then
             if result then
@@ -135,7 +136,18 @@ function vm.getInteger(v)
             end
         elseif n.type ~= 'local'
         and    n.type ~= 'global' then
-            return nil
+            hasNonInteger = true
+        end
+    end
+    if hasNonInteger then
+        result = nil
+    end
+    -- If value not found via compiled node, try the local's
+    -- definition value directly (tracer may not preserve literals)
+    if result == nil and v.type == 'getlocal' then
+        local loc = v.node
+        if loc and loc.value then
+            return vm.getInteger(loc.value)
         end
     end
     return result

test/code_action/init.lua

@@ -1,50 +1,21 @@
-local core  = require 'core.code-action'
-local files = require 'files'
-local lang  = require 'language'
-local catch = require 'catch'
-local furi  = require 'file-uri'
+local core    = require 'core.code-action'
+local files   = require 'files'
+local lang    = require 'language'
+local catch   = require 'catch'
+local furi    = require 'file-uri'
+local compare = require 'compare'
 
 rawset(_G, 'TEST', true)
 
-local EXISTS = {}
+local EXISTS = compare.EXISTS
 
-local function eq(expected, result)
-    if expected == EXISTS and result ~= nil then
-        return true
-    end
-    if result == EXISTS and expected ~= nil then
-        return true
-    end
-    local tp1, tp2 = type(expected), type(result)
-    if tp1 ~= tp2 then
-        return false, string.format(": expected type %s, got %s", tp1, tp2)
-    end
-    if tp1 == 'table' then
-        local mark = {}
-        for k in pairs(expected) do
-            local ok, err = eq(expected[k], result[k])
-            if not ok then
-                return false, string.format(".%s%s", k, err)
-            end
-            mark[k] = true
-        end
-        for k in pairs(result) do
-            if not mark[k] then
-                return false, string.format(".%s: missing key in result", k)
-            end
-        end
-        return true
-    end
-    return expected == result, string.format(": expected %s, got %s", expected, result)
-end
-
-function TEST(script)
+local function TEST(script)
     return function (expect)
         local newScript, catched = catch(script, '?')
         files.setText(TESTURI, newScript)
         local results = core(TESTURI, catched['?'][1][1], catched['?'][1][2])
         assert(results)
-        assert(eq(expect, results))
+        assert(compare.eq(expect, results))
         files.remove(TESTURI)
     end
 end
@@ -72,7 +43,7 @@ local function TEST_CROSSFILE(testfiles)
 
         local results = core(TESTURI, catched['?'][1][1], catched['?'][1][2])
         assert(results)
-        assert(eq(expected, results))
+        assert(compare.eq(expected, results))
     end
 end