Merge branch 'master' into bug/2977-lua-autodoc-includes-global-table

sumneko · web-flow · commit 9e8efd247500 · 2025-12-16T22:20:50.000+08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,7 +38,18 @@ jobs:
 
       - uses: actboy168/setup-luamake@master
 
+      - name: Install zig
+        if: matrix.target == 'linux'
+        run:
+          sudo snap install zig --classic --beta
+
+      - name: Prepare zig wrapper
+        if: matrix.target == 'linux'
+        run: chmod +x zig-cc-wrapper.sh
+
       - name: Build
+        env:
+          USE_ZIG: ${{ matrix.target == 'linux' && '1' || '0' }}
         run: luamake -platform ${{ matrix.platform }}
 
       - name: Setting up workflow variables
diff --git a/3rd/bee.lua b/3rd/bee.lua
@@ -1 +1 @@
-Subproject commit dd7853f1bd010c701fb5fc4ee0d4082cdbc07ae8
+Subproject commit ee7efd07155c33c2c95f4a66d17b2f3ef122896a
diff --git a/3rd/json.lua b/3rd/json.lua
@@ -1 +1 @@
-Subproject commit aff2a3d90dd35b5761301de0e2af700266aec41a
+Subproject commit f94860ef551036490c5b3db6098325267f42ef28
diff --git a/3rd/luamake b/3rd/luamake
@@ -1 +1 @@
-Subproject commit 0e90778390fb11d917c6e4c5cb963356a0780fb0
+Subproject commit a83fa224d083ad5ee4d39367621ee8c8c8db379b
diff --git a/changelog.md b/changelog.md
@@ -2,8 +2,16 @@
 
 ## Unreleased
 <!-- Add all new changes here. They will be moved under a version at release -->
+* `New` Omit parameter hints when the argument name matches
+* `FIX` Fix a typo in `no-unknown` diagnostic message
 * `FIX` Autodoc generation so it does not include documentation for builtin Lua language features
 
+## 3.16.1
+`2025-12-8`
+* `FIX` Broken in Linux
+* `FIX` Fix diagnostic completions incorrect textEdit.finish
+* `FIX` Comparison crash in doc export CLI [#3111](https://github.com/LuaLS/lua-language-server/issues/3111)
+
 ## 3.16.0
 `2025-12-2`
 * `NEW` Support Lua 5.5
diff --git a/locale/en-us/script.lua b/locale/en-us/script.lua
@@ -89,7 +89,7 @@ DIAG_COSE_NON_OBJECT    =
 DIAG_COUNT_DOWN_LOOP    =
 'Do you mean `{}` ?'
 DIAG_UNKNOWN            =
-'Can not infer type.'
+'Cannot infer type.'
 DIAG_DEPRECATED         =
 'Deprecated.'
 DIAG_DIFFERENT_REQUIRES =
diff --git a/make/detect_platform.lua b/make/detect_platform.lua
@@ -21,12 +21,37 @@ elseif platform.os == 'windows' then
         error "unknown platform"
     end
 elseif platform.os == 'linux' then
-    if     lm.platform == nil then
-    elseif lm.platform == "linux-x64" then
-    elseif lm.platform == "linux-arm64" then
-        lm.cc = 'aarch64-linux-gnu-gcc'
+    -- Use Zig for Linux builds to ensure glibc 2.17 compatibility
+    local use_zig = os.getenv("USE_ZIG")
+    if use_zig and use_zig ~= "0" and use_zig ~= "false" then
+        -- Set compiler to zig wrapper script that filters out -lstdc++fs
+        -- The wrapper is needed because bee.lua requires stdc++fs but Zig's libc++ already includes it
+        local wrapper = lm.workdir .. '/zig-cc-wrapper.sh'
+        lm.cc = wrapper
+        lm.ar = 'zig ar'
+        
+        if     lm.platform == nil then
+            -- Auto-detect and set target
+        elseif lm.platform == "linux-x64" then
+            -- Target glibc 2.17 for x86_64
+            lm.flags = { '-target', 'x86_64-linux-gnu.2.17' }
+            lm.ldflags = { '-target', 'x86_64-linux-gnu.2.17', '-lc++' }
+        elseif lm.platform == "linux-arm64" then
+            -- Target glibc 2.17 for aarch64
+            lm.flags = { '-target', 'aarch64-linux-gnu.2.17' }
+            lm.ldflags = { '-target', 'aarch64-linux-gnu.2.17', '-lc++' }
+        else
+            error "unknown platform"
+        end
     else
-        error "unknown platform"
+        -- Use default GCC
+        if     lm.platform == nil then
+        elseif lm.platform == "linux-x64" then
+        elseif lm.platform == "linux-arm64" then
+            lm.cc = 'aarch64-linux-gnu-gcc'
+        else
+            error "unknown platform"
+        end
     end
 end
 
diff --git a/script/cli/doc/export.lua b/script/cli/doc/export.lua
@@ -72,11 +72,11 @@ function export.positionOf(rowcol)
 end
 
 function export.sortDoc(a,b)
-    if a.name ~= b.name then
+    if a.name and b.name and a.name ~= b.name then
         return a.name < b.name
     end
 
-    if a.file ~= b.file then
+    if a.file and b.file and a.file ~= b.file then
         return a.file < b.file
     end
 
diff --git a/script/core/completion/completion.lua b/script/core/completion/completion.lua
@@ -1925,7 +1925,7 @@ local function tryluaDocBySource(state, position, source, results)
                     kind     = define.CompletionItemKind.Enum,
                     textEdit = {
                         start   = source.start,
-                        finish  = source.start + #source.mode - 1,
+                        finish  = source.start + #source.mode,
                         newText = mode,
                     },
                 }
@@ -1940,7 +1940,7 @@ local function tryluaDocBySource(state, position, source, results)
                     kind     = define.CompletionItemKind.Value,
                     textEdit = {
                         start   = source.start,
-                        finish  = source.start + #source[1] - 1,
+                        finish  = source.start + #source[1],
                         newText = name,
                     },
                 }
diff --git a/script/core/hint.lua b/script/core/hint.lua
@@ -145,7 +145,7 @@ local function paramName(uri, results, start, finish)
             and (paramConfig ~= 'Literal' or guide.isLiteral(arg)) then
                 mark[arg] = true
                 local param = params[i]
-                if param and param[1] then
+                if param and param[1] and param[1] ~= arg[1] then
                     results[#results+1] = {
                         text    = param[1] .. ':',
                         offset  = arg.start,
diff --git a/test.lua b/test.lua
@@ -76,6 +76,7 @@ local function testAll()
     test 'diagnostics'
     test 'crossfile'
     test 'highlight'
+    test 'inlay_hint'
     test 'rename'
     test 'signature'
     test 'command'
diff --git a/test/basic/textmerger.lua b/test/basic/textmerger.lua
@@ -214,3 +214,29 @@ print(12345)
         text = "",
     },
 }
+
+local text = string.rep('abcdefghijklmnopqrstuvwxyz\n', 10000)
+local changes = {}
+for i = 1, 100 do
+    changes[#changes+1] = {
+        range = {
+            start = { line = i * 10, character = 0 },
+            ['end'] = { line = i * 10, character = 5 },
+        },
+        text = 'changed words',
+    }
+end
+for i = 1, 100 do
+    changes[#changes+1] = {
+        range = {
+            start = { line = i * 10 + 5000, character = 10 },
+            ['end'] = { line = i * 10 + 5 + 5000, character = 20 },
+        },
+        text = '',
+    }
+end
+
+local c1 = os.clock()
+tm(text, nil, changes)
+local c2 = os.clock()
+print('text-merger Large test time:', c2 - c1)
diff --git a/test/inlay_hint/init.lua b/test/inlay_hint/init.lua
@@ -0,0 +1,150 @@
+local core   = require 'core.hint'
+local files  = require 'files'
+local catch  = require 'catch'
+local config = require 'config'
+local define = require 'proto.define'
+
+rawset(_G, 'TEST', true)
+
+---@diagnostic disable: await-in-sync
+local function TEST(script, expect, opts)
+    opts = opts or {}
+    local newScript, catched = catch(script, '!')
+
+    files.setText(TESTURI, newScript)
+    files.compileState(TESTURI)
+
+    local results = core(TESTURI, 0, math.huge)
+    table.sort(results, function (a, b)
+        if a.offset ~= b.offset then
+            return a.offset < b.offset
+        end
+        return a.text < b.text
+    end)
+
+    if #expect ~= #results then
+        print('Expect count:', #expect, 'Result count:', #results)
+        for i, res in ipairs(results) do
+            print(('  %d: text=%s kind=%s where=%s offset=%s'):format(
+                i,
+                tostring(res.text),
+                tostring(res.kind),
+                tostring(res.where),
+                tostring(res.offset)
+            ))
+        end
+    end
+
+    assert(#expect == #results)
+    for i, res in ipairs(results) do
+        local info = expect[i]
+        local pos = catched['!'][info.pos]
+        assert(pos)
+        local offset = info.useFinish and pos[2] or pos[1]
+        assert(res.text == info.text)
+        assert(res.kind == info.kind)
+        assert(res.where == info.where)
+        assert(res.offset == offset)
+    end
+
+    files.remove(TESTURI)
+end
+
+config.set(nil, 'Lua.hint.enable', true)
+
+config.set(nil, 'Lua.hint.setType', true)
+
+TEST([[
+---@return integer
+local function returnsInt()
+    return 1
+end
+
+local <!val!> = returnsInt()
+]], {
+    {
+        pos   = 1,
+        text  = ': integer',
+        kind  = define.InlayHintKind.Type,
+        where = 'right',
+        useFinish = true,
+    },
+})
+
+config.set(nil, 'Lua.hint.paramName', 'Literal')
+
+TEST([[
+local function foo(first, second)
+end
+
+foo(<!1!>, x)
+foo(<!1!>, <!2!>)
+]], {
+    {
+        pos   = 1,
+        text  = 'first:',
+        kind  = define.InlayHintKind.Parameter,
+        where = 'left',
+    },
+    {
+        pos   = 2,
+        text  = 'first:',
+        kind  = define.InlayHintKind.Parameter,
+        where = 'left',
+    },
+    {
+        pos   = 3,
+        text  = 'second:',
+        kind  = define.InlayHintKind.Parameter,
+        where = 'left',
+    },
+})
+
+config.set(nil, 'Lua.hint.paramName', 'All')
+
+TEST([[
+local function foo(first, second)
+end
+
+local first, second
+foo(<!first!>, <!second!>)
+]], {})
+
+
+config.set(nil, 'Lua.hint.arrayIndex', 'Enable')
+
+TEST([[
+local t = {
+    <!'first'!>,
+    <!'second'!>,
+    <!'third'!>,
+    <!'fourth'!>,
+}
+]], {
+    {
+        pos   = 1,
+        text  = '[1]',
+        kind  = define.InlayHintKind.Other,
+        where = 'left',
+    },
+    {
+        pos   = 2,
+        text  = '[2]',
+        kind  = define.InlayHintKind.Other,
+        where = 'left',
+    },
+    {
+        pos   = 3,
+        text  = '[3]',
+        kind  = define.InlayHintKind.Other,
+        where = 'left',
+    },
+    {
+        pos   = 4,
+        text  = '[4]',
+        kind  = define.InlayHintKind.Other,
+        where = 'left',
+    },
+})
+
+config.set(nil, 'Lua.hint.enable', false)
diff --git a/zig-cc-wrapper.sh b/zig-cc-wrapper.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Wrapper script for Zig compiler to filter out -lstdc++fs
+# Zig's libc++ already includes filesystem support
+
+# Filter out -lstdc++fs from arguments
+args=()
+for arg in "$@"; do
+    if [ "$arg" != "-lstdc++fs" ]; then
+        args+=("$arg")
+    fi
+done
+
+# Call zig c++ with filtered arguments
+exec zig c++ "${args[@]}"
