update to 3.10.6

Author: CppCXY

resources/script/cli/doc/export.lua

@@ -1,3 +1,4 @@
+---@diagnostic disable: await-in-sync, param-type-mismatch
 local ws       = require 'workspace'
 local vm       = require 'vm'
 local guide    = require 'parser.guide'
@@ -351,4 +352,4 @@ function export.serializeAndExport(docs, outputDir)
     return true, {jsonPath, mdPath}
 end
 
-return export
+return export

resources/script/cli/doc/init.lua

@@ -52,8 +52,8 @@ end
 
 ---clones a module and assigns any internal upvalues pointing to the module to the new clone
 ---useful for sandboxing
----@param tbl table module to be cloned
----@return table module_clone the cloned module
+---@param tbl any module to be cloned
+---@return any module_clone the cloned module
 local function reinstantiateModule(tbl, _new_module, _old_module, _has_seen)
     _old_module = _old_module or tbl --remember old module only at root
     _has_seen = _has_seen or {} --remember visited indecies
@@ -78,6 +78,7 @@ local function reinstantiateModule(tbl, _new_module, _old_module, _has_seen)
             i = i + 1
         end
         local new_func = load(string.dump(func))--, 'function@reinstantiateModule()', 'b', _ENV)
+        assert(new_func, 'could not load dumped function')
         for index, upvalue in ipairs(upvalues) do
             debug.setupvalue(new_func, index, upvalue)
         end
@@ -240,4 +241,4 @@ function doc.runCLI()
     end)
 end
 
-return doc
+return doc

resources/script/core/completion/completion.lua

@@ -78,7 +78,9 @@ local function findNearestSource(state, position)
     ---@type parser.object
     local source
     guide.eachSourceContain(state.ast, position, function (src)
-        source = src
+        if not source or source.start <= src.start then
+            source = src
+        end
     end)
     return source
 end
@@ -455,19 +457,8 @@ local function checkFieldFromFieldToIndex(state, name, src, parent, word, startP
         name = ('%q'):format(name)
     end
     local textEdit, additionalTextEdits
-    local startOffset = guide.positionToOffset(state, startPos)
     local offset      = guide.positionToOffset(state, position)
-    local wordStartOffset
-    if word == '' then
-        wordStartOffset = state.lua:match('()%S', startOffset + 1)
-        if wordStartOffset then
-            wordStartOffset = wordStartOffset - 1
-        else
-            wordStartOffset = offset
-        end
-    else
-        wordStartOffset = offset - #word
-    end
+    local wordStartOffset = offset - #word
     local wordStartPos = guide.offsetToPosition(state, wordStartOffset)
     local newText = ('[%s]'):format(name)
     textEdit = {

resources/script/lclient.lua

@@ -83,6 +83,9 @@ local defaultClientOptions = {
                 },
             },
         },
+        workspace = {
+            configuration = true,
+        },
     },
 }
 

resources/script/plugin.lua

@@ -7,15 +7,6 @@ local scope  = require 'workspace.scope'
 local ws     = require 'workspace'
 local fs = require 'bee.filesystem'
 
----@class pluginInterfaces
-local pluginConfigs = {
-    -- create plugin for vm module
-    VM = {
-        OnCompileFunctionParam = function (next, func, source)
-        end
-    }
-}
-
 ---@class plugin
 local m = {}
 
@@ -60,14 +51,13 @@ function m.dispatch(event, uri, ...)
     return failed == 0, res1, res2
 end
 
-function m.getVmPlugin(uri)
+function m.getPluginInterfaces(uri)
     local scp = scope.getScope(uri)
-    ---@type pluginInterfaces
     local interfaces = scp:get('pluginInterfaces')
     if not interfaces then
         return
     end
-    return interfaces.VM
+    return interfaces
 end
 
 ---@async
@@ -100,40 +90,6 @@ local function checkTrustLoad(scp)
     return true
 end
 
-local function createMethodGroup(interfaces, key, methods)
-    local methodGroup = {}
-
-    for method in pairs(methods) do
-        local funcs = setmetatable({}, {
-            __call = function (t, next, ...)
-                if #t == 0 then
-                    return next(...)
-                else
-                    local result
-                    for _, fn in ipairs(t) do
-                        result = fn(next, ...)
-                    end
-                    return result
-                end
-            end
-        })
-        for _, interface in ipairs(interfaces) do
-            local func = interface[method]
-            if not func then
-                local namespace = interface[key]
-                if namespace then
-                    func = namespace[method]
-                end
-            end
-            if func then
-                funcs[#funcs+1] = func
-            end
-        end
-        methodGroup[method] = funcs
-    end
-    return #methodGroup>0 and methodGroup or nil
-end
-
 ---@param uri uri
 local function initPlugin(uri)
     await.call(function () ---@async
@@ -206,10 +162,6 @@ local function initPlugin(uri)
             interfaces[#interfaces+1] = interface
         end
 
-        for key, config in pairs(pluginConfigs) do
-            interfaces[key] = createMethodGroup(interfaces, key, config)
-        end
-
         ws.resetFiles(scp)
     end)
 end

resources/script/provider/provider.lua

@@ -41,7 +41,10 @@ function m.updateConfig(uri)
     end
 
     for _, folder in ipairs(scope.folders) do
-        local clientConfig = cfgLoader.loadClientConfig(folder.uri)
+        local clientConfig = nil
+        if client.getAbility('workspace.configuration') then
+            clientConfig = cfgLoader.loadClientConfig(folder.uri)
+        end
         if clientConfig then
             log.info('Load config from client', folder.uri)
             log.info(inspect(clientConfig))
@@ -57,10 +60,12 @@ function m.updateConfig(uri)
         config.update(folder, clientConfig, rc)
     end
 
-    local global = cfgLoader.loadClientConfig()
-    log.info('Load config from client', 'fallback')
-    log.info(inspect(global))
-    config.update(scope.fallback, global)
+    if client.getAbility('workspace.configuration') then
+        local global = cfgLoader.loadClientConfig()
+        log.info('Load config from client', 'fallback')
+        log.info(inspect(global))
+        config.update(scope.fallback, global)
+    end
 end
 
 function m.register(method)