fix build

Author: CppCXY

CodeFormatCLib/include/CodeFormatCLib.h

@@ -1,7 +1,7 @@
 #ifndef CODE_FORMAT_C_LIB_H
 #define CODE_FORMAT_C_LIB_H
 
-#include <stdint.h> // 使用固定大小的整数类型
+#include <cstdint>// 使用固定大小的整数类型
 
 #if defined(_WIN32)
 #define EMMY_API __declspec(dllexport)
@@ -10,36 +10,20 @@
 #else
 #define EMMY_API
 #endif
+#include "Types.h"
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
-// 使用固定大小的类型，并确保结构体按字节对齐
-typedef struct RangeFormatResult {
-    int32_t StartLine;
-    int32_t StartCharacter;
-    int32_t EndLine;
-    int32_t EndCharacter;
-    char *Text;
-} RangeFormatResult;
-
-// 定义不透明指针类型
-typedef struct CodeFormatHandle CodeFormatHandle;
-
-// 创建和销毁 CodeFormat 实例
-EMMY_API CodeFormatHandle* CreateCodeFormat();
-EMMY_API void DestroyCodeFormat(CodeFormatHandle* handle);
-
-// 修改函数使用不透明指针
-EMMY_API char* ReformatLuaCode(CodeFormatHandle* handle, const char *code, const char *uri);
-EMMY_API RangeFormatResult RangeFormatLuaCode(CodeFormatHandle* handle, const char *code, const char *uri, int32_t startLine, int32_t startCol, int32_t endLine, int32_t endCol);
+EMMY_API char *ReformatLuaCode(const char *code, const char *uri);
+
+EMMY_API RangeFormatResult RangeFormatLuaCode(const char *code, const char *uri, int startLine, int startCol, int endLine, int endCol);
+
 EMMY_API void FreeReformatResult(char *ptr);
-EMMY_API void UpdateCodeStyle(CodeFormatHandle* handle, const char *workspaceUri, const char *configPath);
-EMMY_API void RemoveCodeStyle(CodeFormatHandle* handle, const char *workspaceUri);
 
-#ifdef __cplusplus
+EMMY_API void UpdateCodeStyle(const char *workspaceUri, const char *configPath);
+
+EMMY_API void RemoveCodeStyle(const char *workspaceUri);
 }
-#endif
+
 
 #endif// CODE_FORMAT_C_LIB_H

CodeFormatCLib/src/CodeFormat.cpp

@@ -57,8 +57,8 @@ void CodeFormat::SupportNonStandardSymbol() {
     _supportNonStandardSymbol = true;
 }
 
-char* CodeFormat::Reformat(const std::string &uri, const std::string &text, size_t &length) {
-    auto file = std::make_shared<LuaSource>(text);
+char *CodeFormat::Reformat(const std::string &uri, std::string &&text) {
+    auto file = LuaSource::From(std::move(text));
     LuaLexer luaLexer(file);
     if (_supportNonStandardSymbol) {
         luaLexer.SupportNonStandardSymbol();
@@ -69,11 +69,10 @@ char* CodeFormat::Reformat(const std::string &uri, const std::string &text, size
 
     luaLexer.Parse();
 
-    LuaParser p(file, luaLexer.GetTokens());
+    LuaParser p(file, std::move(luaLexer.GetTokens()));
     p.Parse();
 
     if (p.HasError()) {
-        length = 0;
         return nullptr;
     }
 
@@ -85,20 +84,13 @@ char* CodeFormat::Reformat(const std::string &uri, const std::string &text, size
     FormatBuilder f(style);
 
     auto result = f.GetFormatResult(t);
-    length = result.size();
+    auto length = result.size();
     char *ptr = new char[length + 1];
     std::copy(result.begin(), result.end(), ptr);
     ptr[length] = '\0';
     return ptr;
 }
 
-void CodeFormat::FreeRangeFormatResult(RangeFormatResult &result) {
-    if (result.Text) {
-        delete[] result.Text;
-        result.Text = nullptr;
-    }
-}
-
 Result<RangeFormatResult> CodeFormat::RangeFormat(const std::string &uri, FormatRange &range,
                                                   std::string &&text) {
     auto file = std::make_shared<LuaSource>(std::move(text));

CodeFormatCLib/src/CodeFormat.h

@@ -30,18 +30,19 @@ class CodeFormat {
 
     void SupportNonStandardSymbol();
 
-    char* Reformat(const std::string &uri, const std::string &text, size_t &length); // 修改返回类型和参数
-    RangeFormatResult RangeFormat(const std::string &uri, FormatRange &range, const std::string &text);
-    void FreeRangeFormatResult(RangeFormatResult &result); // 提供释放函数
+    char *Reformat(const std::string &uri, std::string &&text);
 
-    void SupportCLikeComments(); // 添加支持 C 语言注释的函数
+    Result<RangeFormatResult> RangeFormat(const std::string &uri, FormatRange &range, std::string &&text);
+
+    void SupportCLikeComments();// 添加支持 C 语言注释的函数
 
     Result<std::vector<LuaTypeFormat::Result>>
     TypeFormat(const std::string &uri, std::size_t line, std::size_t character, std::string &&text);
 
     Result<std::vector<LuaDiagnosticInfo>> Diagnostic(const std::string &uri, std::string &&text);
 
     LuaStyle &GetStyle(const std::string &uri);
+
 private:
     std::vector<LuaDiagnosticInfo> MakeDiagnosticInfo(const std::vector<LuaDiagnostic> &diagnostics,
                                                       std::shared_ptr<LuaSource> file);
@@ -53,4 +54,3 @@ class CodeFormat {
     bool _supportNonStandardSymbol;
     bool _supportCLikeComments;
 };
-

CodeFormatCLib/src/CodeFormatCLib.cpp

@@ -1,47 +1,17 @@
-#include "CodeFormat.h"
 #include "CodeFormatCLib.h"
+#include "CodeFormat.h"
 #include "Types.h"
 
-#if defined(_WIN32)
-#define EMMY_API __declspec(dllexport)
-#elif defined(__GNUC__)
-#define EMMY_API __attribute__((visibility("default")))
-#else
-#define EMMY_API
-#endif
-
-
 extern "C" {
 
-// 定义不透明指针结构
-struct CodeFormatHandle {
-    CodeFormat* instance;
-};
-
-// 创建 CodeFormat 实例
-EMMY_API CodeFormatHandle* CreateCodeFormat() {
-    CodeFormatHandle* handle = new CodeFormatHandle();
-    handle->instance = &CodeFormat::GetInstance();
-    return handle;
-}
-
-// 销毁 CodeFormat 实例
-EMMY_API void DestroyCodeFormat(CodeFormatHandle* handle) {
-    delete handle;
-}
-
-EMMY_API char *ReformatLuaCode(CodeFormatHandle* handle, const char *code, const char *uri) {
-    CodeFormat &codeFormat = *handle->instance;
+EMMY_API char *ReformatLuaCode(const char *code, const char *uri) {
+    CodeFormat &codeFormat = CodeFormat::GetInstance();
     auto result = codeFormat.Reformat(uri, code);
-    if (result.Type == ResultType::Ok) {
-        return result.Data;
-    } else {
-        return nullptr;
-    }
+    return result;
 }
 
-EMMY_API RangeFormatResult RangeFormatLuaCode(CodeFormatHandle* handle, const char *code, const char *uri, int startLine, int startCol, int endLine, int endCol) {
-    CodeFormat &codeFormat = *handle->instance;
+EMMY_API RangeFormatResult RangeFormatLuaCode(const char *code, const char *uri, int startLine, int startCol, int endLine, int endCol) {
+    CodeFormat &codeFormat = CodeFormat::GetInstance();
     FormatRange range;
     range.StartLine = startLine;
     range.StartCol = startCol;
@@ -59,13 +29,13 @@ EMMY_API void FreeReformatResult(char *ptr) {
     delete[] ptr;
 }
 
-EMMY_API void UpdateCodeStyle(CodeFormatHandle* handle, const char *workspaceUri, const char *configPath) {
-    CodeFormat &codeFormat = *handle->instance;
+EMMY_API void UpdateCodeStyle(const char *workspaceUri, const char *configPath) {
+    CodeFormat &codeFormat = CodeFormat::GetInstance();
     codeFormat.UpdateCodeStyle(workspaceUri, configPath);
 }
 
-EMMY_API void RemoveCodeStyle(CodeFormatHandle* handle, const char *workspaceUri) {
-    CodeFormat &codeFormat = *handle->instance;
+EMMY_API void RemoveCodeStyle(const char *workspaceUri) {
+    CodeFormat &codeFormat = CodeFormat::GetInstance();
     codeFormat.RemoveCodeStyle(workspaceUri);
 }
 }

CodeFormatCLib/src/Types.h

@@ -1,7 +1,15 @@
 #pragma once
 
-#include <stdint.h> // 使用固定大小的整数类型
-#include <stddef.h> // 对于指针大小
+#include <cstdint> // 使用固定大小的整数类型
+#include <cstddef> // 对于指针大小
+#include <string_view>
+
+#include "CodeFormatCore/Config/LuaEditorConfig.h"
+#include "CodeFormatCore/Config/LuaStyle.h"
+#include "CodeFormatCore/Diagnostic/DiagnosticBuilder.h"
+#include "CodeFormatCore/Diagnostic/Spell/CodeSpellChecker.h"
+#include "CodeFormatCore/Format/FormatBuilder.h"
+#include "CodeFormatCore/TypeFormat/LuaTypeFormat.h"
 
 struct LuaConfig {
     explicit LuaConfig(std::string_view workspace)
@@ -20,8 +28,8 @@ struct LuaDiagnosticInfo {
     DiagnosticType Type;
     Position Start;
     Position End;
-    char* Message;
-    char* Data;
+    std::string Message;
+    std::string Data;
 };
 
 enum class ResultType {