diff options
| author | fesily <fesil@foxmail.com> | 2023-05-25 15:14:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-25 15:14:59 +0800 |
| commit | 3991bea32c342d621c11a8bd4742592e672a1e09 (patch) | |
| tree | 840280c2f8d3de0f56d1603a895e642a9dd29ebe | |
| parent | 754e7194e45892a5d596cf9f331d4667b7542aa8 (diff) | |
| parent | adc1c1ba2f1039d36655f9042f0e16053115e88a (diff) | |
| download | lua-language-server-3991bea32c342d621c11a8bd4742592e672a1e09.zip | |
Merge branch 'master' into meta-support-metable
| m--------- | 3rd/EmmyLuaCodeStyle | 0 | ||||
| -rw-r--r-- | changelog.md | 4 | ||||
| -rw-r--r-- | meta/template/jit.profile.lua | 4 | ||||
| -rw-r--r-- | meta/template/jit.util.lua | 2 | ||||
| -rw-r--r-- | script/plugins/ffi/init.lua | 2 |
5 files changed, 9 insertions, 3 deletions
diff --git a/3rd/EmmyLuaCodeStyle b/3rd/EmmyLuaCodeStyle -Subproject edf464104a039f15ed39d700ba5e4c3a932c786 +Subproject 82aca211b6ee403a832412b9f7938db797c564d diff --git a/changelog.md b/changelog.md index b1e918cd..35c4c301 100644 --- a/changelog.md +++ b/changelog.md @@ -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` diff --git a/meta/template/jit.profile.lua b/meta/template/jit.profile.lua index d0e788ce..a7db77bf 100644 --- a/meta/template/jit.profile.lua +++ b/meta/template/jit.profile.lua @@ -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) diff --git a/meta/template/jit.util.lua b/meta/template/jit.util.lua index 08694286..cf525527 100644 --- a/meta/template/jit.util.lua +++ b/meta/template/jit.util.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 diff --git a/script/plugins/ffi/init.lua b/script/plugins/ffi/init.lua index a551973a..f9162e21 100644 --- a/script/plugins/ffi/init.lua +++ b/script/plugins/ffi/init.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 |