Merge pull request #915 from CppCXY/format

code reformat

Author: sumneko

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "3rd/lovr-api"]
 	path = 3rd/lovr-api
 	url = https://github.com/bjornbytes/lovr-docs
+[submodule "3rd/EmmyLuaCodeStyle"]
+	path = 3rd/EmmyLuaCodeStyle
+	url = https://github.com/CppCXY/EmmyLuaCodeStyle

3rd/EmmyLuaCodeStyle

@@ -37,6 +37,7 @@ elseif platform.OS == 'Linux' then
 end
 
 lm:import "3rd/bee.lua/make.lua"
+lm:import "make/code_format.lua"
 
 lm:source_set 'lpeglabel' {
     rootdir = '3rd',
@@ -48,7 +49,7 @@ lm:source_set 'lpeglabel' {
 }
 
 lm:executable "lua-language-server" {
-    deps = {"lpeglabel", "source_bootstrap"},
+    deps = {"lpeglabel", "source_bootstrap", "code_format"},
     includes = {
         "3rd/bee.lua",
         "3rd/bee.lua/3rd/lua",

make.lua

@@ -0,0 +1,27 @@
+local lm = require 'luamake'
+
+lm:source_set 'code_format' {
+    rootdir = '../3rd/EmmyLuaCodeStyle',
+    includes = {
+        "include",
+        "../bee.lua/3rd/lua"
+    },
+    sources = {
+        -- codeFormatLib
+        "CodeFormatLib/src/*.cpp",
+        -- LuaParser
+        "LuaParser/src/*.cpp",
+        "LuaParser/src/LuaAstNode/LuaAstNode.cpp",
+        -- Util
+        "Util/src/StringUtil.cpp",
+        "Util/src/Utf8.cpp",
+        --CodeService
+        "CodeService/src/*.cpp",
+        "CodeService/src/FormatElement/*.cpp",
+        "CodeService/src/NameStyle/*.cpp"
+    },
+    macos = {
+        -- macosx10.12不支持完整的std filesystem，只好砍功能
+        defines = "NOT_SURPPORT_FILE_SYSTEM",
+    },
+}

make/code_format.lua

@@ -2,3 +2,7 @@
 
 extern "C" int luaopen_lpeglabel (lua_State *L);
 static ::bee::lua::callfunc _init(::bee::lua::register_module, "lpeglabel", luaopen_lpeglabel);
+
+extern "C" int luaopen_code_format(lua_State *L);
+static ::bee::lua::callfunc _init_code_format(::bee::lua::register_module, "code_format",
+                                  luaopen_code_format);

make/modules.cpp

@@ -0,0 +1,34 @@
+local files = require("files")
+local codeFormat = require "code_format"
+local converter = require("proto.converter")
+local log = require("log")
+local config = require("config")
+
+
+---@async
+return function(uri, callback)
+    local text = files.getText(uri)
+    if not text then
+        return
+    end
+
+    local status, diagnosticInfos = codeFormat.diagnose_file(uri, text)
+
+    if not status then
+        if diagnosticInfos ~= nil then
+            log.error(diagnosticInfos)
+        end
+
+        return
+    end
+    
+    if diagnosticInfos then
+        for _, diagnosticInfo in pairs(diagnosticInfos) do
+            callback {
+                start = converter.unpackPosition(uri, diagnosticInfo.range.start),
+                finish = converter.unpackPosition(uri, diagnosticInfo.range["end"]),
+                message = diagnosticInfo.message
+            }
+        end
+    end
+end

script/core/diagnostics/codestyle-check.lua

@@ -0,0 +1,25 @@
+local codeFormat = require("code_format")
+local files = require("files")
+local log = require("log")
+
+return function(uri)
+    local text = files.getText(uri)
+    local ast = files.getState(uri)
+    local status, formattedText = codeFormat.format(uri, text)
+
+    if not status then
+        if formattedText ~= nil then
+            log.error(formattedText)
+        end
+
+        return
+    end
+
+    return {
+        {
+            start = ast.ast.start,
+            finish = ast.ast.finish,
+            text = formattedText,
+        }
+    }
+end

script/core/formatting.lua

@@ -0,0 +1,26 @@
+local codeFormat = require("code_format")
+local files = require("files")
+local log = require("log")
+local converter = require("proto.converter")
+
+return function(uri, range)
+    local text = files.getText(uri)
+    local status, formattedText, startLine, endLine = codeFormat.range_format(
+        uri, text, range.start.line, range["end"].line)
+
+    if not status then
+        if formattedText ~= nil then
+            log.error(formattedText)
+        end
+
+        return
+    end
+
+    return {
+        {
+            start = converter.unpackPosition(uri, { line = startLine, character = 0 }),
+            finish = converter.unpackPosition(uri, { line = endLine + 1, character = 0 }),
+            text = formattedText,
+        }
+    }
+end

script/core/rangeformatting.lua

@@ -46,6 +46,7 @@ local function checkSplitOneLine(results, uri, position, ch)
     if ch ~= '\n' then
         return
     end
+
     local fPosition, fSymbol = findForward(uri, position, 'end', '}')
     if not fPosition then
         return
@@ -77,7 +78,7 @@ local function checkSplitOneLine(results, uri, position, ch)
 end
 
 return function (uri, position, ch)
-    local ast  = files.getState(uri)
+    local ast = files.getState(uri)
     if not ast then
         return nil
     end

script/core/type-formatting.lua

@@ -58,6 +58,7 @@ m.DiagnosticDefaultSeverity = {
     ['doc-field-no-class']      = 'Warning',
     ['duplicate-doc-field']     = 'Warning',
     ['unknown-diag-code']       = 'Waiting',
+    ['codestyle-check']         = "Warning",
 }
 
 ---@alias DiagnosticDefaultNeededFileStatus