refactor file path, clean up code

Author: CppCXY

CMakeLists.txt

@@ -22,7 +22,7 @@ if(APPLE)
 endif ()
 
 add_subdirectory(LuaParser)
-add_subdirectory(CodeService)
+add_subdirectory(CodeFormatCore)
 add_subdirectory(Util)
 
 if(BuildAsLuaLib)

CodeFormat/CMakeLists.txt

@@ -1,23 +1,22 @@
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.14)
 
 project(CodeFormat)
 
-add_executable(CodeFormat ../include/CodeService/Format/Analyzer/FormatDocAnalyze.h)
+add_executable(CodeFormat)
 
 add_dependencies(CodeFormat CodeService Util)
 
-target_include_directories(CodeFormat PUBLIC
-	${LuaCodeStyle_SOURCE_DIR}/include
+target_include_directories(CodeFormat PRIVATE
 	src
 )
 
 target_sources(CodeFormat
-	PUBLIC
-	${CodeFormat_SOURCE_DIR}/src/CodeFormat.cpp
-	${CodeFormat_SOURCE_DIR}/src/LuaFormat.cpp
+	PRIVATE
+	src/CodeFormat.cpp
+	src/LuaFormat.cpp
 )
 
-target_link_libraries(CodeFormat CodeService Util)
+target_link_libraries(CodeFormat PUBLIC CodeService Util)
 
 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
 	target_link_libraries(CodeFormat -static-libstdc++ -static-libgcc)	

CodeFormat/src/LuaFormat.cpp

@@ -3,15 +3,15 @@
 #include <fstream>
 #include <sstream>
 #include "Util/format.h"
-#include "CodeService/Config/LuaEditorConfig.h"
+#include "CodeFormatCore/Config/LuaEditorConfig.h"
 #include "Util/StringUtil.h"
 #include "LuaParser/File/LuaFile.h"
 #include "LuaParser/Types/TextRange.h"
 #include "LuaParser/Lexer/LuaLexer.h"
 #include "LuaParser/Ast/LuaSyntaxTree.h"
-#include "CodeService/Format/FormatBuilder.h"
+#include "CodeFormatCore/Format/FormatBuilder.h"
 #include "LuaParser/Parse/LuaParser.h"
-#include "CodeService/Diagnostic/DiagnosticBuilder.h"
+#include "CodeFormatCore/Diagnostic/DiagnosticBuilder.h"
 #include "Util/FileFinder.h"
 #include "Util/Url.h"
 

CodeFormat/src/LuaFormat.h

@@ -5,11 +5,11 @@
 #include <filesystem>
 #include <cstring>
 #include <optional>
-#include "CodeService/Config/LuaStyle.h"
+#include "CodeFormatCore/Config/LuaStyle.h"
 #include "LuaParser/File/LuaFile.h"
 #include "LuaParser/Types/TextRange.h"
 #include "Types.h"
-#include "CodeService/Config/LuaDiagnosticStyle.h"
+#include "CodeFormatCore/Config/LuaDiagnosticStyle.h"
 
 class LuaFormat {
 public:

CodeFormat/src/Types.h

@@ -2,7 +2,7 @@
 
 #include <string_view>
 #include <memory>
-#include "CodeService/Config/LuaEditorConfig.h"
+#include "CodeFormatCore/Config/LuaEditorConfig.h"
 
 
 struct LuaConfig {

CodeFormatCore/CMakeLists.txt

@@ -0,0 +1,60 @@
+cmake_minimum_required(VERSION 3.14)
+
+project(CodeService)
+
+add_library(CodeService STATIC)
+
+add_dependencies(CodeService LuaParser Util)
+
+target_include_directories(CodeService
+        PUBLIC
+        include
+        PRIVATE
+        src
+        )
+
+target_sources(CodeService
+        PRIVATE
+        # config
+        src/Config/FunctionOption.cpp
+        src/Config/LuaStyle.cpp
+        src/Config/LuaEditorConfig.cpp
+        src/Config/LuaDiagnosticStyle.cpp
+        src/Config/LanguageTranslator.cpp
+        src/Config/EditorconfigPattern.cpp
+
+        # format
+        src/Format/FormatBuilder.cpp
+        src/Format/FormatState.cpp
+        src/Format/Analyzer/FormatAnalyzer.cpp
+        src/Format/Analyzer/SpaceAnalyzer.cpp
+        src/Format/Analyzer/IndentationAnalyzer.cpp
+        src/Format/Analyzer/LineBreakAnalyzer.cpp
+        src/Format/Analyzer/FormatDocAnalyze.cpp
+        src/Format/Analyzer/AlignAnalyzer.cpp
+        src/Format/Analyzer/TokenAnalyzer.cpp
+        src/Format/Analyzer/FormatResolve.cpp
+        src/Format/Analyzer/SyntaxNodeHelper.cpp
+        # rangeFormat
+        src/RangeFormat/RangeFormatBuilder.cpp
+        # typeFormat
+        src/TypeFormat/LuaTypeFormat.cpp
+        src/TypeFormat/LuaTypeFormatOptions.cpp
+        # diagnostic
+        src/Diagnostic/DiagnosticBuilder.cpp
+        # diagnostic/nameStyle
+        src/Diagnostic/NameStyle/NameStyleChecker.cpp
+        src/Diagnostic/NameStyle/NameStyleRuleMatcher.cpp
+        # diagnostic/spell
+        src/Diagnostic/Spell/CodeSpellChecker.cpp
+        src/Diagnostic/Spell/IdentifyParser.cpp
+        src/Diagnostic/Spell/TextParser.cpp
+        # diagnostic/codestyle
+        src/Diagnostic/CodeStyle/CodeStyleChecker.cpp
+        )
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    target_compile_options(CodeService PUBLIC /utf-8)
+endif ()
+
+target_link_libraries(CodeService LuaParser Util)