Merge branch 'master' into meta-support-metable

Author: fesily

3rd/EmmyLuaCodeStyle

@@ -1,5 +1,9 @@
 # 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`

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

@@ -367,6 +367,8 @@ files.watch(function (ev, uri)
 end)
 
 ws.watch(function (ev, uri)
+    -- TODO
+    do return end
     if ev == 'startReload' then
         if config.get(uri, 'Lua.runtime.version') ~= 'LuaJIT' then
             return