cleanup

Author: sumneko

.editorconfig

@@ -76,12 +76,14 @@ enable_name_style_check = true
 # snake_case | upper_snake_case
 # same(first_param, snake_case)
 # same('m')
-local_name_define_style = camel_case
+local_name_define_style = camel_case|upper_snake_case
 function_param_name_style = camel_case
 function_name_define_style = camel_case
 local_function_name_define_style = camel_case
-table_field_name_define_style = camel_case
+table_field_name_define_style = camel_case|pascal_case
 global_variable_name_define_style = camel_case|upper_snake_case
 module_name_define_style = camel_case
 require_module_name_style = camel_case
 class_name_define_style = camel_case
+table_append_expression_no_space = true
+if_condition_align_with_each_other = true

main.lua

@@ -10,7 +10,7 @@ local function loadArgs()
             goto CONTINUE
         end
         local value = tail:match '=(.+)'
-        if value == 'true' or value == nil then
+        if     value == 'true' or value == nil then
             value = true
         elseif value == 'false' then
             value = false

make.lua

@@ -7,8 +7,8 @@ lm.bindir = "bin"
 ---@diagnostic disable-next-line: codestyle-check
 lm.EXE_DIR = ""
 
-if platform.OS == 'macOS' then
-    if lm.platform == nil then
+if     platform.OS == 'macOS' then
+    if     lm.platform == nil then
     elseif lm.platform == "darwin-arm64" then
         lm.target = "arm64-apple-macos11"
     elseif lm.platform == "darwin-x64" then
@@ -17,7 +17,7 @@ if platform.OS == 'macOS' then
         error "unknown platform"
     end
 elseif platform.OS == 'Windows' then
-    if lm.platform == nil then
+    if     lm.platform == nil then
     elseif lm.platform == "win32-ia32" then
         lm.arch = "x86"
     elseif lm.platform == "win32-x64" then
@@ -26,7 +26,7 @@ elseif platform.OS == 'Windows' then
         error "unknown platform"
     end
 elseif platform.OS == 'Linux' then
-    if lm.platform == nil then
+    if     lm.platform == nil then
     elseif lm.platform == "linux-x64" then
     elseif lm.platform == "linux-arm64" then
         -- TODO: not implement
@@ -128,15 +128,15 @@ if notest then
 end
 
 lm:build "bee-test" {
-    lm.bindir.."/lua-language-server"..exe, "3rd/bee.lua/test/test.lua",
+    lm.bindir .. "/lua-language-server" .. exe, "3rd/bee.lua/test/test.lua",
     pool = "console",
     deps = {
         "all",
     }
 }
 
 lm:build 'unit-test' {
-    lm.bindir.."/lua-language-server"..exe, 'test.lua',
+    lm.bindir .. "/lua-language-server" .. exe, 'test.lua',
     pool = "console",
     deps = {
         "bee-test",

make/bootstrap.lua

@@ -1,7 +1,7 @@
 local main, exec
 local i = 1
 while arg[i] do
-    if arg[i] == '-E' then
+    if     arg[i] == '-E' then
     elseif arg[i] == '-e' then
         i = i + 1
         local expr = assert(arg[i], "'-e' needs argument")

script/client.lua

@@ -315,7 +315,7 @@ end
 function m.setConfig(changes, onlyMemory)
     local finalChanges = {}
     for _, change in ipairs(changes) do
-        if change.action == 'add' then
+        if     change.action == 'add' then
             local suc = config.add(change.uri, change.key, change.value)
             if suc then
                 finalChanges[#finalChanges+1] = change

script/config/config.lua

@@ -47,7 +47,7 @@ end)
 
 register('Integer', 0, function (self, v)
     return type(v) == 'number'
-end,function (self, v)
+end, function (self, v)
     return math.floor(v)
 end)
 
@@ -118,7 +118,7 @@ end, function (self, value)
     end
     if type(value) == 'string' then
         local t = {}
-        for s in value:gmatch('[^'..self.sep..']+') do
+        for s in value:gmatch('[^' .. self.sep .. ']+') do
             t[s] = true
         end
         return t
@@ -143,7 +143,7 @@ end, function (self, value)
         end
     end
 end, function (self, ...)
-    self.subs = {...}
+    self.subs = { ... }
 end)
 
 local Template = {
@@ -412,7 +412,7 @@ function m.update(scp, ...)
             if m.nullSymbols[value] then
                 value = m.NULL
             end
-            if Template[fullKey] then
+            if     Template[fullKey] then
                 m.setByScope(scp, fullKey, value)
             elseif Template['Lua.' .. fullKey] then
                 m.setByScope(scp, 'Lua.' .. fullKey, value)

script/config/loader.lua

@@ -45,7 +45,7 @@ function m.loadLocalConfig(uri, filename)
         scp:set('lastLocalType', nil)
         return nil
     end
-    local buf  = util.loadFile(path)
+    local buf = util.loadFile(path)
     if not buf then
         errorMessage(lang.script('CONFIG_LOAD_FAILED', path))
         scp:set('lastLocalConfig', nil)

script/core/code-action.lua

@@ -12,24 +12,29 @@ local function checkDisableByLuaDocExits(uri, row, mode, code)
     local state = files.getState(uri)
     local lines = state.lines
     if state.ast.docs and lines then
-        return guide.eachSourceBetween(state.ast.docs, guide.positionOf(row, 0), guide.positionOf(row + 1, 0), function (doc)
-            if  doc.type == 'doc.diagnostic'
-            and doc.mode == mode then
-                if doc.names then
-                    return {
-                        start   = doc.finish,
-                        finish  = doc.finish,
-                        newText = ', ' .. code,
-                    }
-                else
-                    return {
-                        start   = doc.finish,
-                        finish  = doc.finish,
-                        newText = ': ' .. code,
-                    }
+        return guide.eachSourceBetween(
+            state.ast.docs,
+            guide.positionOf(row, 0),
+            guide.positionOf(row + 1, 0),
+            function (doc)
+                if  doc.type == 'doc.diagnostic'
+                and doc.mode == mode then
+                    if doc.names then
+                        return {
+                            start   = doc.finish,
+                            finish  = doc.finish,
+                            newText = ', ' .. code,
+                        }
+                    else
+                        return {
+                            start   = doc.finish,
+                            finish  = doc.finish,
+                            newText = ': ' .. code,
+                        }
+                    end
                 end
             end
-        end)
+        )
     end
     return nil
 end
@@ -86,7 +91,7 @@ local function markGlobal(uri, name, results)
         kind    = 'quickfix',
         command = {
             title     = lang.script.COMMAND_MARK_GLOBAL,
-            command = 'lua.setConfig',
+            command   = 'lua.setConfig',
             arguments = {
                 {
                     key    = 'Lua.diagnostics.globals',
@@ -208,7 +213,7 @@ local function solveSyntaxByFix(uri, err, results)
     results[#results+1] = {
         title = lang.script('ACTION_' .. err.fix.title, err.fix),
         kind  = 'quickfix',
-        edit = {
+        edit  = {
             changes = {
                 [uri] = changes,
             }
@@ -263,8 +268,8 @@ local function solveNewlineCall(uri, diag, results)
             changes = {
                 [uri] = {
                     {
-                        start  = start,
-                        finish = start,
+                        start   = start,
+                        finish  = start,
                         newText = ';',
                     }
                 }
@@ -335,8 +340,8 @@ local function solveAwaitInSync(uri, diag, results)
             changes = {
                 [uri] = {
                     {
-                        start  = pos,
-                        finish = pos,
+                        start   = pos,
+                        finish  = pos,
                         newText = '---@async\n',
                     }
                 }
@@ -541,11 +546,11 @@ end
 --end
 
 local function checkJsonToLua(results, uri, start, finish)
-    local text  = files.getText(uri)
-    local state = files.getState(uri)
+    local text         = files.getText(uri)
+    local state        = files.getState(uri)
     local startOffset  = guide.positionToOffset(state, start)
     local finishOffset = guide.positionToOffset(state, finish)
-    local jsonStart = text:match ('()[%{%[]', startOffset + 1)
+    local jsonStart    = text:match('()[%{%[]', startOffset + 1)
     if not jsonStart then
         return
     end