clean up code

Author: CppCXY

.github/workflows/build.yml

@@ -19,7 +19,10 @@ jobs:
           - { os: macos-latest, target: darwin, platform: darwin-arm64}
           - { os: windows-latest, target: windows, platform: win32-x64 }
     steps:
-    - uses: actions/checkout@v2
+    - uses: nodejs/setup-node@v3
+      with:
+        node-version: '16'
+    - uses: actions/checkout@v3
       with:
         ref: refs/heads/master
     - name: install gcc 11

.github/workflows/codestyle.yml

@@ -0,0 +1,32 @@
+name: CodeStyle
+
+on:
+  pull_request:
+    branches: [master]
+
+jobs:
+  clang-format:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Install ClangFormat
+        run: sudo apt-get install -y clang-format
+      - name: Run ClangFormat
+        run: clang-format -style=file -output-replacements-xml $(find . -name '*.cpp' -or -name '*.h' -not -path "./3rd/*" -not -path "./Test/*" -not -path "./Test2/*") | grep -c '<replacement ' > /tmp/clang-format-result
+      - name: Comment on pull request
+        uses: actions/github-script@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const fs = require('fs');
+            const result = fs.readFileSync('/tmp/clang-format-result', 'utf8');
+            const comment = `ClangFormat check found ${result} formatting issues.`;
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: comment
+            });

.github/workflows/pr.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+    types: [opened, synchronize]
 
 jobs:
   build:
@@ -17,7 +18,10 @@ jobs:
           - { os: macos-latest, target: darwin, platform: darwin-arm64}
           - { os: windows-latest, target: windows, platform: win32-x64 }
     steps:
-    - uses: actions/checkout@v2
+    - uses: nodejs/setup-node@v3
+      with:
+        node-version: '16'
+    - uses: actions/checkout@v3
     - name: install gcc 11
       if: startsWith(matrix.os, 'ubuntu')
       run: |
@@ -38,7 +42,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DBUILD_GMOCK=OFF -DINSTALL_GTEST=OFF
+        cmake .. -DBUILD_GMOCK=OFF -DINSTALL_GTEST=OFF -DCMAKE_BUILD_TYPE=Release
         cmake --build . --config Release
         ctest -V -C Release
         cmake --install . --config Release --prefix ${{ github.workspace }}/artifact/
@@ -48,16 +52,16 @@ jobs:
         mkdir build
         cd build
         if [[ "${{ matrix.platform }}" = darwin-arm64 ]]; then
-          cmake .. -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DBUILD_GMOCK=OFF -DINSTALL_GTEST=OFF
+          cmake .. -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DBUILD_GMOCK=OFF -DINSTALL_GTEST=OFF -DCMAKE_BUILD_TYPE=Release
         else
-          cmake .. -DBUILD_GMOCK=OFF -DINSTALL_GTEST=OFF
+          cmake .. -DBUILD_GMOCK=OFF -DINSTALL_GTEST=OFF -DCMAKE_BUILD_TYPE=Release
         fi
         cmake --build . --config Release
         ctest -V -C Release
         cmake --install . --config Release --prefix ${{ github.workspace }}/artifact/
 
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with: 
         name: ${{ matrix.platform }}
         path: ${{ github.workspace }}/artifact/

CodeFormat/CMakeLists.txt

@@ -7,23 +7,23 @@ add_executable(CodeFormat)
 add_dependencies(CodeFormat CodeFormatCore Util)
 
 target_include_directories(CodeFormat PRIVATE
-	src
+        src
 )
 
 target_sources(CodeFormat
-	PRIVATE
-	src/CodeFormat.cpp
-	src/LuaFormat.cpp
+        PRIVATE
+        src/CodeFormat.cpp
+        src/LuaFormat.cpp
 )
 
 target_link_libraries(CodeFormat CodeFormatCore Util)
 
-if(CMAKE_SYSTEM_NAME STREQUAL Linux)
-	target_link_libraries(CodeFormat -static-libstdc++ -static-libgcc)	
-endif()
+if (CMAKE_SYSTEM_NAME STREQUAL Linux)
+    target_link_libraries(CodeFormat -static-libstdc++ -static-libgcc)
+endif ()
 
 install(
-    TARGETS CodeFormat
-    LIBRARY DESTINATION lib
-    RUNTIME DESTINATION bin
+        TARGETS CodeFormat
+        LIBRARY DESTINATION lib
+        RUNTIME DESTINATION bin
 )

CodeFormat/src/LuaFormat.h

@@ -50,6 +50,7 @@ class LuaFormat {
     void SetFormatRange(bool rangeLine, std::string_view rangeStr);
 
     void SupportNonStandardLua();
+
 private:
     std::optional<std::string> ReadFile(std::string_view path);
 
@@ -58,7 +59,7 @@ class LuaFormat {
     void DiagnosticInspection(std::string_view message, TextRange range, std::shared_ptr<LuaSource> file,
                               std::string_view path);
 
-    bool ReformatSingleFile(std::string_view inputPath, std::string_view outPath, std::string&& sourceText);
+    bool ReformatSingleFile(std::string_view inputPath, std::string_view outPath, std::string &&sourceText);
 
     bool ReformatWorkspace();
 

CodeFormat/src/Types.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include <string_view>
-#include <memory>
 #include "CodeFormatCore/Config/LuaEditorConfig.h"
+#include <memory>
+#include <string_view>
 
 
 struct LuaConfig {
     explicit LuaConfig(std::string_view workspace)
-            : Workspace(workspace), Editorconfig(nullptr) {}
+        : Workspace(workspace), Editorconfig(nullptr) {}
 
     std::string Workspace;
     std::shared_ptr<LuaEditorConfig> Editorconfig;

CodeFormatCore/CMakeLists.txt

@@ -11,7 +11,7 @@ target_include_directories(CodeFormatCore
         include
         PRIVATE
         src
-        )
+)
 
 target_sources(CodeFormatCore
         PRIVATE
@@ -33,11 +33,12 @@ target_sources(CodeFormatCore
         src/Format/Analyzer/FormatDocAnalyze.cpp
         src/Format/Analyzer/AlignAnalyzer.cpp
         src/Format/Analyzer/TokenAnalyzer.cpp
-		src/Format/Analyzer/SemicolonAnalyzer.cpp
+        src/Format/Analyzer/SemicolonAnalyzer.cpp
         src/Format/Analyzer/FormatResolve.cpp
         src/Format/Analyzer/SyntaxNodeHelper.cpp
         # rangeFormat
         src/RangeFormat/RangeFormatBuilder.cpp
+        #        src/RangeFormat/MultiRangesFormatBuilder.cpp
         # typeFormat
         src/TypeFormat/LuaTypeFormat.cpp
         src/TypeFormat/LuaTypeFormatFeatures.cpp
@@ -51,7 +52,7 @@ target_sources(CodeFormatCore
         src/Diagnostic/Spell/Util.cpp
         # diagnostic/codestyle
         src/Diagnostic/CodeStyle/CodeStyleChecker.cpp
-		)
+)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     target_compile_options(CodeFormatCore PUBLIC /utf-8)

CodeFormatCore/include/CodeFormatCore/Config/LanguageTranslator.h

@@ -1,25 +1,23 @@
 #pragma once
 
-#include <string>
 #include <map>
+#include <string>
 
-class LanguageTranslator
-{
+class LanguageTranslator {
 public:
-	static LanguageTranslator& GetInstance();
+    static LanguageTranslator &GetInstance();
 
-	LanguageTranslator();
+    LanguageTranslator();
 
-	std::string Get(const std::string& source);
+    std::string Get(const std::string &source);
 
-	void SetLanguageMap(std::map<std::string, std::string>&& languageDictionary);
+    void SetLanguageMap(std::map<std::string, std::string> &&languageDictionary);
 
 private:
-	std::map<std::string, std::string> _languageDictionary;
+    std::map<std::string, std::string> _languageDictionary;
 };
 
 /*
  * 语言本地化翻译实例，保持一种惯用法
  */
 #define LText(text) LanguageTranslator::GetInstance().Get(text)
-

CodeFormatCore/include/CodeFormatCore/Config/LuaDiagnosticStyle.h

@@ -11,7 +11,7 @@ class LuaDiagnosticStyle {
 public:
     LuaDiagnosticStyle() = default;
 
-    void ParseTree(InfoTree& tree);
+    void ParseTree(InfoTree &tree);
 
     bool code_style_check = true;
 
@@ -31,12 +31,10 @@ class LuaDiagnosticStyle {
 
     std::vector<NameStyleRule> global_variable_name_style = {
             NameStyleRule(NameStyleType::SnakeCase),
-            NameStyleRule(NameStyleType::UpperSnakeCase)
-    };
+            NameStyleRule(NameStyleType::UpperSnakeCase)};
 
     std::vector<NameStyleRule> module_name_style = {
-            NameStyleRule(NameStyleType::SnakeCase)
-    };
+            NameStyleRule(NameStyleType::SnakeCase)};
 
     std::vector<NameStyleRule> require_module_name_style = {
             NameStyleRule(NameStyleType::SnakeCase),
@@ -45,6 +43,5 @@ class LuaDiagnosticStyle {
 
     std::vector<NameStyleRule> class_name_style = {
             NameStyleRule(NameStyleType::SnakeCase),
-            NameStyleRule(NameStyleType::PascalCase)
-    };
+            NameStyleRule(NameStyleType::PascalCase)};
 };

CodeFormatCore/include/CodeFormatCore/Config/LuaEditorConfig.h

@@ -1,10 +1,10 @@
 #pragma once
 
+#include "EditorconfigPattern.h"
+#include "LuaStyle.h"
 #include <map>
-#include <string>
 #include <memory>
-#include "LuaStyle.h"
-#include "EditorconfigPattern.h"
+#include <string>
 
 class LuaEditorConfig {
 public:
@@ -27,7 +27,6 @@ class LuaEditorConfig {
     LuaStyle &Generate(std::string_view fileUri);
 
 private:
-
     std::string _source;
     std::vector<Section> _sections;
     std::map<std::string, LuaStyle, std::less<>> _styleMap;