Merge branch 'LuaLS:master' into luajit-ffi-support

fesily · web-flow · commit 46f6f7ac596e · 2023-05-11T13:10:17.000+08:00
diff --git a/3rd/EmmyLuaCodeStyle b/3rd/EmmyLuaCodeStyle
@@ -1 +1 @@
-Subproject commit 081b623d03627b281d5744ab53c420667573b955
+Subproject commit 28bff899e7590f594b15146ea5f3a791268d1427
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 # changelog
 
+## 3.6.20
+* `NEW` support connecting by socket with `--socket=PORT`
+
 ## 3.6.19
 `2023-4-26`
 * `FIX` commandline parameter `checklevel` may not work
diff --git a/locale/en-us/setting.lua b/locale/en-us/setting.lua
@@ -269,6 +269,8 @@ Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/doc
 ]]
 config.spell.dict                        =
 'Custom words for spell checking.'
+config.nameStyle.config                  =
+'Set name style config'
 config.telemetry.enable                  =
 [[
 Enable telemetry to send your editor information and error logs over the network. Read our privacy policy [here](https://github.com/LuaLS/lua-language-server/wiki/Home#privacy).
@@ -401,6 +403,8 @@ config.diagnostics['return-type-mismatch']  =
 'Enable diagnostics for return values whose type does not match the type declared in the corresponding return annotation.'
 config.diagnostics['spell-check']           =
 'Enable diagnostics for typos in strings.'
+config.diagnostics['name-style-check']      =
+'Enable diagnostics for name style.'
 config.diagnostics['unbalanced-assignments']=
 'Enable diagnostics on multiple assignments if not all variables obtain a value (e.g., `local x,y = 1`).'
 config.diagnostics['undefined-doc-class']   =
diff --git a/locale/pt-br/setting.lua b/locale/pt-br/setting.lua
@@ -269,6 +269,8 @@ Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/doc
 ]]
 config.spell.dict                        = -- TODO: need translate!
 'Custom words for spell checking.'
+config.nameStyle.config                  = -- TODO: need translate!
+'Set name style config'
 config.telemetry.enable                  = -- TODO: need translate!
 [[
 Enable telemetry to send your editor information and error logs over the network. Read our privacy policy [here](https://github.com/LuaLS/lua-language-server/wiki/Home#privacy).
@@ -401,6 +403,8 @@ config.diagnostics['return-type-mismatch']  = -- TODO: need translate!
 'Enable diagnostics for return values whose type does not match the type declared in the corresponding return annotation.'
 config.diagnostics['spell-check']           = -- TODO: need translate!
 'Enable diagnostics for typos in strings.'
+config.diagnostics['name-style-check']      = -- TODO: need translate!
+'Enable diagnostics for name style.'
 config.diagnostics['unbalanced-assignments']= -- TODO: need translate!
 'Enable diagnostics on multiple assignments if not all variables obtain a value (e.g., `local x,y = 1`).'
 config.diagnostics['undefined-doc-class']   = -- TODO: need translate!
diff --git a/locale/zh-cn/setting.lua b/locale/zh-cn/setting.lua
@@ -268,6 +268,8 @@ config.format.defaultConfig              =
 ]]
 config.spell.dict                        =
 '拼写检查的自定义单词。'
+config.nameStyle.config                  =
+'设定命名风格检查的配置'
 config.telemetry.enable                  =
 [[
 启用遥测，通过网络发送你的编辑器信息与错误日志。在[此处](https://github.com/LuaLS/lua-language-server/wiki/Home#privacy)阅读我们的隐私声明。
@@ -400,6 +402,8 @@ config.diagnostics['return-type-mismatch']  = -- TODO: need translate!
 'Enable diagnostics for return values whose type does not match the type declared in the corresponding return annotation.'
 config.diagnostics['spell-check']           = -- TODO: need translate!
 'Enable diagnostics for typos in strings.'
+config.diagnostics['name-style-check']      = -- TODO: need translate!
+'Enable diagnostics for name style.'
 config.diagnostics['unbalanced-assignments']= -- TODO: need translate!
 'Enable diagnostics on multiple assignments if not all variables obtain a value (e.g., `local x,y = 1`).'
 config.diagnostics['undefined-doc-class']   = -- TODO: need translate!
diff --git a/locale/zh-tw/setting.lua b/locale/zh-tw/setting.lua
@@ -268,6 +268,8 @@ config.format.defaultConfig              =
 ]]
 config.spell.dict                        =
 '拼寫檢查的自訂單詞。'
+config.nameStyle.config                  = -- TODO: need translate!
+'Set name style config'
 config.telemetry.enable                  =
 [[
 啟用遙測，透過網路發送你的編輯器資訊與錯誤日誌。在[此處](https://github.com/LuaLS/lua-language-server/wiki/Home#privacy)閱讀我們的隱私聲明。
@@ -400,6 +402,8 @@ config.diagnostics['return-type-mismatch']  = -- TODO: need translate!
 'Enable diagnostics for return values whose type does not match the type declared in the corresponding return annotation.'
 config.diagnostics['spell-check']           = -- TODO: need translate!
 'Enable diagnostics for typos in strings.'
+config.diagnostics['name-style-check']      = -- TODO: need translate!
+'Enable diagnostics for name style.'
 config.diagnostics['unbalanced-assignments']= -- TODO: need translate!
 'Enable diagnostics on multiple assignments if not all variables obtain a value (e.g., `local x,y = 1`).'
 config.diagnostics['undefined-doc-class']   = -- TODO: need translate!
diff --git a/make/code_format.lua b/make/code_format.lua
@@ -19,6 +19,7 @@ lm:source_set 'code_format' {
         "Util/src/StringUtil.cpp",
         "Util/src/Utf8.cpp",
         "Util/src/SymSpell/*.cpp",
+        "Util/src/InfoTree/*.cpp",
         --CodeService
         "CodeService/src/**/*.cpp",
     },
diff --git a/script/brave/work.lua b/script/brave/work.lua
@@ -1,6 +1,6 @@
 local brave   = require 'brave.brave'
 
-brave.on('loadProto', function ()
+brave.on('loadProtoByStdio', function ()
     local jsonrpc = require 'jsonrpc'
     while true do
         local proto, err = jsonrpc.decode(io.read)
@@ -13,6 +13,37 @@ brave.on('loadProto', function ()
     end
 end)
 
+brave.on('loadProtoBySocket', function (fdHandle)
+    local jsonrpc = require 'jsonrpc'
+    local socket  = require 'bee.socket'
+    local thread  = require 'bee.thread'
+    local fd = socket.fd(fdHandle)
+    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)
+                end
+            end
+        end)
+        --log.debug('loaded proto', proto.method)
+        if not proto then
+            brave.push('protoerror', err)
+            return
+        end
+        brave.push('proto', proto)
+    end
+end)
+
 brave.on('timer', function (time)
     local thread = require 'bee.thread'
     while true do
diff --git a/script/config/template.lua b/script/config/template.lua
@@ -385,6 +385,8 @@ local template = {
                                                 auto_complete_table_sep = "true"
                                             },
     ['Lua.spell.dict']                      = Type.Array(Type.String),
+    ['Lua.nameStyle.config']                = Type.Hash(Type.String, Type.Or(Type.String, Type.Array(Type.Hash(Type.String, Type.String))))
+                                            >> {},
     ['Lua.misc.parameters']                 = Type.Array(Type.String),
     ['Lua.misc.executablePath']             = Type.String,
     ['Lua.type.castNumberToInteger']        = Type.Boolean >> true,
diff --git a/script/core/diagnostics/name-style-check.lua b/script/core/diagnostics/name-style-check.lua
@@ -0,0 +1,35 @@
+local files     = require 'files'
+local converter = require 'proto.converter'
+local log       = require 'log'
+local nameStyle = require 'provider.name-style'
+
+
+---@async
+return function (uri, callback)
+    local state = files.getState(uri)
+    if not state then
+        return
+    end
+    local text = state.originText
+
+    local status, diagnosticInfos = nameStyle.nameStyleCheck(uri, text)
+
+    if not status then
+        if diagnosticInfos ~= nil then
+            log.error(diagnosticInfos)
+        end
+
+        return
+    end
+
+    if diagnosticInfos then
+        for _, diagnosticInfo in ipairs(diagnosticInfos) do
+            callback {
+                start   = converter.unpackPosition(state, diagnosticInfo.range.start),
+                finish  = converter.unpackPosition(state, diagnosticInfo.range["end"]),
+                message = diagnosticInfo.message,
+                data    = diagnosticInfo.data
+            }
+        end
+    end
+end
diff --git a/script/global.d.lua b/script/global.d.lua
@@ -73,3 +73,7 @@ COMPILECORES = 0
 -- TODO: delete this after new config
 ---@diagnostic disable-next-line: lowercase-global
 jit = false
+
+-- connect to client by socket
+---@type integer
+SOCKET = 0
diff --git a/script/jsonrpc.lua b/script/jsonrpc.lua
@@ -14,17 +14,23 @@ function m.encode(pack)
     return buf
 end
 
+---@param reader fun(arg: integer):string
 local function readProtoHead(reader)
     local head = {}
+    local line = ''
     while true do
-        local line = reader 'L'
-        if line == nil then
+        local char = reader(1)
+        if char == nil then
             -- 说明管道已经关闭了
             return nil, 'Disconnected!'
         end
+        line = line .. char
         if line == '\r\n' then
             break
         end
+        if line:sub(-2) ~= '\r\n' then
+            goto continue
+        end
         local k, v = line:match '^([^:]+)%s*%:%s*(.+)\r\n$'
         if not k then
             return nil, 'Proto header error: ' .. line
@@ -33,10 +39,13 @@ local function readProtoHead(reader)
             v = tonumber(v)
         end
         head[k] = v
+        line = ''
+        ::continue::
     end
     return head
 end
 
+---@param reader fun(arg: integer):string
 function m.decode(reader)
     local head, err = readProtoHead(reader)
     if not head then
diff --git a/script/meta/bee/socket.lua b/script/meta/bee/socket.lua
@@ -0,0 +1,62 @@
+---@meta
+
+---@alias bee.socket.protocol
+---| 'tcp'
+---| 'udp'
+---| 'unix'
+---| 'tcp6'
+---| 'udp6'
+
+---@class bee.socket
+---@overload fun(protocol: bee.socket.protocol): bee.socket.fd?, string?
+local socket = {}
+
+---@param readfds? bee.socket.fd[]
+---@param writefds? bee.socket.fd[]
+---@param timeout number
+---@return bee.socket.fd[] # readfds
+---@return bee.socket.fd[] # writefds
+function socket.select(readfds, writefds, timeout) end
+
+---@param handle lightuserdata
+---@return bee.socket.fd
+function socket.fd(handle) end
+
+---@class bee.socket.fd
+local fd = {}
+
+---@param addr string
+---@param port? integer
+---@return boolean
+---@return string?
+function fd:bind(addr, port) end
+
+function fd:close() end
+
+---@return boolean
+---@return string?
+function fd:listen() end
+
+---@param addr string
+---@param port integer
+---@return boolean
+---@return string?
+function fd:connect(addr, port) end
+
+---@param len? integer
+---@return string | false
+function fd:recv(len) end
+
+---@param content string
+function fd:send(content) end
+
+---@return lightuserdata
+function fd:handle() end
+
+---@return boolean
+function fd:status() end
+
+---@return bee.socket.fd
+function fd:accept() end
+
+return socket
diff --git a/script/meta/bee/thread.lua b/script/meta/bee/thread.lua
@@ -0,0 +1,33 @@
+---@meta
+
+---@class bee.thread
+local thread = {}
+
+---@param time number
+function thread.sleep(time) end
+
+---@param name string
+function thread.newchannel(name) end
+
+---@param name string
+---@return bee.thread.channel
+function thread.channel(name) end
+
+---@param script string
+---@return bee.thread.thread
+function thread.thread(script) end
+
+---@class bee.thread.channel
+local channel = {}
+
+function channel:push(...) end
+
+---@return ...
+function channel:pop() end
+
+---@return ...
+function channel:bpop() end
+
+---@class bee.thread.thread
+
+return thread
diff --git a/script/proto/diagnostic.lua b/script/proto/diagnostic.lua
@@ -125,6 +125,14 @@ m.register {
     status   = 'None',
 }
 
+m.register {
+    'name-style-check'
+} {
+    group    = 'codestyle',
+    severity = 'Warning',
+    status   = 'None',
+}
+
 m.register {
     'newline-call',
     'newfield-call',
diff --git a/script/proto/proto.lua b/script/proto/proto.lua
diff --git a/script/provider/name-style.lua b/script/provider/name-style.lua
diff --git a/script/service/service.lua b/script/service/service.lua
