Merge branch 'master' of github.com:Gowa2017/lua-language-server

Author: Gowa2017

.gitignore

@@ -4,7 +4,4 @@
 /meta/*
 !/meta/template
 !/meta/3rd
-/bin-Windows
-/bin-Linux
-/bin-macOS
-/bin
+/bin*

.vscode/launch.json

@@ -36,6 +36,9 @@
 				]
 			],
 			"windows": {
+				"name": "🍄attach",
+				"type": "lua",
+				"request": "attach",
 				"sourceMaps": [
 					[
 						"script\\*",

3rd/bee.lua

@@ -36,13 +36,15 @@ server will generate `doc.json` and `doc.md` in `LOGPATH`.
   * `redundant-return-value`
   * `return-type-mismatch`
 * `CHG` workspace-symbol: supports chain fields based on global variables and types. try `io.open` or `iolib.open`
+* `CHG` [#1641] if a function only has varargs and has `---@overload`, the varargs will be ignored
 * `FIX` [#1567]
 * `FIX` [#1593]
 * `FIX` [#1595]
 * `FIX` [#1599]
 * `FIX` [#1606]
 * `FIX` [#1608]
 * `FIX` [#1637]
+* `FIX` [#1642]
 
 [#1177]: https://github.com/sumneko/lua-language-server/issues/1177
 [#1458]: https://github.com/sumneko/lua-language-server/issues/1458
@@ -58,6 +60,8 @@ server will generate `doc.json` and `doc.md` in `LOGPATH`.
 [#1608]: https://github.com/sumneko/lua-language-server/issues/1608
 [#1626]: https://github.com/sumneko/lua-language-server/issues/1626
 [#1637]: https://github.com/sumneko/lua-language-server/issues/1637
+[#1641]: https://github.com/sumneko/lua-language-server/issues/1641
+[#1642]: https://github.com/sumneko/lua-language-server/issues/1642
 
 ## 3.5.6
 `2022-9-16`

3rd/luamake

@@ -40,6 +40,7 @@ brave.on('removeCaches', function (path)
 end)
 
 ---@class brave.param.compile
+---@field uri uri
 ---@field text string
 ---@field mode string
 ---@field version string
@@ -53,10 +54,15 @@ end)
 ---@param param brave.param.compile
 brave.on('compile', function (param)
     local parser = require 'parser'
+    local clock = os.clock()
     local state, err = parser.compile(param.text
         , param.mode
         , param.version
         , param.options
     )
-    return state, err
+    log.debug('compile', param.uri, 'takes:', os.clock() - clock)
+    return {
+        state = state,
+        err   = err,
+    }
 end)

changelog.md

@@ -76,7 +76,7 @@ end
 function m.set(uri, key, value)
     local unit = template[key]
     assert(unit, 'unknown key: ' .. key)
-    local scp = getScope(uri)
+    local scp = getScope(uri, key)
     local oldValue = m.get(uri, key)
     m.setByScope(scp, key, value)
     local newValue = m.get(uri, key)

script/brave/work.lua

@@ -315,7 +315,7 @@ local function checkLocal(state, word, position, results)
                 return orders[a] < orders[b]
             end)
             for _, def in ipairs(defs) do
-                if def.type == 'function'
+                if (def.type == 'function' and not vm.isVarargFunctionWithOverloads(def))
                 or def.type == 'doc.type.function' then
                     local funcLabel = name .. getParams(def, false)
                     buildFunction(results, source, def, false, {
@@ -364,7 +364,7 @@ local function checkModule(state, word, position, results)
         if  not locals[stemName]
         and not vm.hasGlobalSets(state.uri, 'variable', stemName)
         and not globals[stemName]
-        and stemName:match '^[%a_][%w_]*$'
+        and stemName:match(guide.namePatternFull)
         and matchKey(word, stemName) then
             local targetState = files.getState(uri)
             if not targetState then
@@ -422,8 +422,11 @@ local function checkModule(state, word, position, results)
 end
 
 local function checkFieldFromFieldToIndex(state, name, src, parent, word, startPos, position)
-    if name:match '^[%a_][%w_]*$' then
-        return nil
+    if name:match(guide.namePatternFull) then
+        if not name:match '[\x80-\xff]'
+        or config.get(state.uri, 'Lua.runtime.unicodeName') then
+            return nil
+        end
     end
     local textEdit, additionalTextEdits
     local startOffset = guide.positionToOffset(state, startPos)
@@ -474,8 +477,8 @@ local function checkFieldFromFieldToIndex(state, name, src, parent, word, startP
             }
         end
     else
-        if config.get(state.uri, 'Lua.runtime.version') == 'lua 5.1'
-        or config.get(state.uri, 'Lua.runtime.version') == 'luaJIT' then
+        if config.get(state.uri, 'Lua.runtime.version') == 'Lua 5.1'
+        or config.get(state.uri, 'Lua.runtime.version') == 'LuaJIT' then
             textEdit.newText = '_G' .. textEdit.newText
         else
             textEdit.newText = '_ENV' .. textEdit.newText
@@ -487,7 +490,7 @@ end
 local function checkFieldThen(state, name, src, word, startPos, position, parent, oop, results)
     local value = vm.getObjectFunctionValue(src) or src
     local kind = define.CompletionItemKind.Field
-    if value.type == 'function'
+    if (value.type == 'function' and not vm.isVarargFunctionWithOverloads(value))
     or value.type == 'doc.type.function' then
         if oop then
             kind = define.CompletionItemKind.Method
@@ -569,9 +572,11 @@ local function checkFieldOfRefs(refs, state, word, startPos, position, parent, o
             local value = vm.getObjectFunctionValue(src) or src
             if value.type == 'function'
             or value.type == 'doc.type.function' then
-                funcLabel = name .. getParams(value, oop)
-                fields[funcLabel] = src
-                count = count + 1
+                if not vm.isVarargFunctionWithOverloads(value) then
+                    funcLabel = name .. getParams(value, oop)
+                    fields[funcLabel] = src
+                    count = count + 1
+                end
                 if value.type == 'function' and value.bindDocs then
                     for _, doc in ipairs(value.bindDocs) do
                         if doc.type == 'doc.overload' then
@@ -726,7 +731,7 @@ local function checkCommon(state, word, position, results)
             end
         end
     end
-    for str, offset in state.lua:gmatch '([%a_][%w_]+)()' do
+    for str, offset in state.lua:gmatch('(' .. guide.namePattern .. ')()') do
         if #results >= 100 then
             results.incomplete = true
             break

script/config/config.lua

@@ -60,8 +60,12 @@ local function getHover(source)
             if guide.isOOP(def) then
                 oop = true
             end
-            if def.type == 'function'
-            or def.type == 'doc.type.function' then
+            if  def.type == 'function'
+            and not vm.isVarargFunctionWithOverloads(def) then
+                hasFunc = true
+                addHover(def, true, oop)
+            end
+            if def.type == 'doc.type.function' then
                 hasFunc = true
                 addHover(def, true, oop)
             end

script/core/completion/completion.lua

@@ -37,7 +37,7 @@ end
 
 function m.findWord(text, offset)
     for i = offset, 1, -1 do
-        if not text:sub(i, i):match '[%w_]' then
+        if not text:sub(i, i):match '[%w_\x80-\xff]' then
             if i == offset then
                 return nil
             end