Merge branch 'master' into ffi-plugin-lazyload

Author: fesily

.vscode/launch.json

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

3rd/EmmyLuaCodeStyle

@@ -1,7 +1,15 @@
 # changelog
 
+## 3.6.21
+`2023-5-24`
+* `FIX` disable ffi plugin
+
 ## 3.6.20
+`2023-5-23`
 * `NEW` support connecting by socket with `--socket=PORT`
+* `FIX` [#2113]
+
+[#2113]: https://github.com/LuaLS/lua-language-server/issues/2113
 
 ## 3.6.19
 `2023-4-26`

changelog.md

@@ -4,14 +4,14 @@
 local profile = {}
 
 ---@param mode string
----@param func fun(L:thread,samples:integer,vmst:string)
+---@param func fun(L: thread, samples: integer, vmst: string)
 function profile.start(mode, func)
 end
 
 function profile.stop()
 end
 
----@overload fun(th:thread,fmt:string,depth:integer)
+---@overload fun(th: thread, fmt: string, depth: integer)
 ---@param fmt string
 ---@param depth integer
 function profile.dumpstack(fmt, depth)

meta/template/jit.profile.lua

@@ -105,7 +105,7 @@ end
 function util.tracemc(tr)
 end
 
----@overload fun(exitno:integer):integer
+---@overload fun(exitno: integer): integer
 ---@param tr Trace
 ---@param exitno integer
 ---@return integer? addr

meta/template/jit.util.lua

@@ -13,34 +13,60 @@ brave.on('loadProtoByStdio', function ()
     end
 end)
 
-brave.on('loadProtoBySocket', function (fdHandle)
+brave.on('loadProtoBySocket', function (param)
     local jsonrpc = require 'jsonrpc'
     local socket  = require 'bee.socket'
-    local thread  = require 'bee.thread'
-    local fd = socket.fd(fdHandle)
+    local util    = require 'utility'
+    local rfd = socket.fd(param.rfd)
+    local wfd = socket.fd(param.wfd)
     local buf = ''
-    while true do
-        local proto, err = jsonrpc.decode(function (len)
-            while true do
-                if #buf >= len then
-                    local res = buf:sub(1, len)
-                    buf = buf:sub(len + 1)
-                    return res
-                end
-                local data = fd:recv()
-                if data then
-                    buf = buf .. data
-                else
-                    thread.sleep(0.01)
+
+    ---@async
+    local parser = coroutine.create(function ()
+        while true do
+            ---@async
+            local proto, err = jsonrpc.decode(function (len)
+                while true do
+                    if #buf >= len then
+                        local res = buf:sub(1, len)
+                        buf = buf:sub(len + 1)
+                        return res
+                    end
+                    coroutine.yield()
                 end
+            end)
+            --log.debug('loaded proto', proto.method)
+            if not proto then
+                brave.push('protoerror', err)
+                return
             end
-        end)
-        --log.debug('loaded proto', proto.method)
-        if not proto then
-            brave.push('protoerror', err)
-            return
+            brave.push('proto', proto)
         end
-        brave.push('proto', proto)
+    end)
+
+    while true do
+        local rd = socket.select({rfd, wfd}, nil, 10)
+        if not rd or #rd == 0 then
+            goto continue
+        end
+        if util.arrayHas(rd, wfd) then
+            local needSend = wfd:recv()
+            if needSend then
+                rfd:send(needSend)
+            elseif needSend == nil then
+                error('socket closed!')
+            end
+        end
+        if util.arrayHas(rd, rfd) then
+            local recved = rfd:recv()
+            if recved then
+                buf = buf .. recved
+            elseif recved == nil then
+                error('socket closed!')
+            end
+            coroutine.resume(parser)
+        end
+        ::continue::
     end
 end)
 

script/brave/work.lua

@@ -22,6 +22,10 @@ function socket.select(readfds, writefds, timeout) end
 ---@return bee.socket.fd
 function socket.fd(handle) end
 
+---@return bee.socket.fd
+---@return bee.socket.fd
+function socket.pair() end
+
 ---@class bee.socket.fd
 local fd = {}
 
@@ -53,6 +57,9 @@ function fd:send(content) end
 ---@return lightuserdata
 function fd:handle() end
 
+---@return lightuserdata
+function fd:detach() end
+
 ---@return boolean
 function fd:status() end
 

script/meta/bee/socket.lua

@@ -1,32 +1,18 @@
-
 local cpp = {}
 
 local typed = require("plugins.ffi.c-parser.typed")
 local c99 = require("plugins.ffi.c-parser.c99")
 
 local SEP = package.config:sub(1,1)
 
-local shl, shr
-if jit then
-    shl = function(a, b)
-        return bit.lshift(a, b)
-    end
-    shr = function(a, b)
-        return bit.rshift(a, b)
-    end
-else
-    shl, shr = load([[
-        local function shl(a, b)
-            return a << b
-        end
-        local function shr(a, b)
-            return a >> b
-        end
-        return shl, shr
-    ]])()
+local function shl(a, b)
+    return a << b
+end
+local function shr(a, b)
+    return a >> b
 end
 
-local function debug() end
+local function debug(...) end
 --[[
 local inspect = require("inspect")
 local function debug(...)
@@ -623,6 +609,7 @@ cpp.parse_file = typed("string, FILE*?, Ctx? -> Ctx?, string?", function(filenam
         ctx = {
             incdirs = cpp_include_paths(),
             defines = gcc_default_defines(),
+            ---@type any[]
             ifmode = { true },
             output = {},
             current_dir = {}
@@ -785,7 +772,7 @@ cpp.parse_context = typed("string, FILE*?, Ctx? -> Ctx?, string?", function(cont
     for cur, lineitem in ipairs(linelist) do
         local line = lineitem.line
         local tk = lineitem.tk
-        debug(filename, cur, ifmode[#ifmode], #ifmode, line)
+        debug(cur, ifmode[#ifmode], #ifmode, line)
 
         if #ifmode == 1 and (tk.directive == "elif" or tk.directive == "else" or tk.directive == "endif") then
             return nil, "unexpected directive " .. tk.directive
@@ -812,6 +799,7 @@ cpp.parse_context = typed("string, FILE*?, Ctx? -> Ctx?, string?", function(cont
             elseif tk.directive == "if" then
                 table.insert(ifmode, run_expression(ctx, tk.exp))
             elseif tk.directive == "elif" then
+---@diagnostic disable-next-line: assign-type-mismatch
                 ifmode[#ifmode] = "skip"
             elseif tk.directive == "else" then
                 ifmode[#ifmode] = not ifmode[#ifmode]

script/plugins/ffi/c-parser/cpp.lua

@@ -107,6 +107,7 @@ local convert_value = typed("TypeList, table -> CType?, string?", function (lst,
         src.ids = util.expandSingle(src.ids)
         -- FIXME multiple ids, e.g.: int *x, y, *z;
         local ok
+---@diagnostic disable-next-line: cast-local-type
         ok, name, ret_pointer, idxs = get_name(src.id or src.ids)
         if not ok then
             return nil, name

script/plugins/ffi/c-parser/ctypes.lua

@@ -3,6 +3,9 @@ local vm = require 'vm'
 local function getLiterals(arg)
     local literals = vm.getLiterals(arg)
     local res = {}
+    if not literals then
+        return res
+    end
     for k, v in pairs(literals) do
         if type(k) == 'string' then
             res[#res+1] = k