clean code

CppCXY · CppCXY · commit b4dc8d9a9925 · 2023-07-24T14:27:25.000+08:00
diff --git a/CodeFormat/src/LuaFormat.cpp b/CodeFormat/src/LuaFormat.cpp
@@ -138,7 +138,7 @@ void LuaFormat::SetDefaultStyle(std::map<std::string, std::string, std::less<>>
     if (keyValues.empty()) {
         return;
     }
-    _defaultStyle.ParseFromMap(keyValues);
+    _defaultStyle.Parse(keyValues);
 }
 
 bool LuaFormat::Reformat() {
diff --git a/CodeFormatCore/CMakeLists.txt b/CodeFormatCore/CMakeLists.txt
@@ -40,7 +40,7 @@ target_sources(CodeFormatCore
         src/RangeFormat/RangeFormatBuilder.cpp
         # typeFormat
         src/TypeFormat/LuaTypeFormat.cpp
-        src/TypeFormat/LuaTypeFormatOptions.cpp
+        src/TypeFormat/LuaTypeFormatFeatures.cpp
         # diagnostic
         src/Diagnostic/DiagnosticBuilder.cpp
         # diagnostic/nameStyle
diff --git a/CodeFormatCore/include/CodeFormatCore/Config/LuaStyle.h b/CodeFormatCore/include/CodeFormatCore/Config/LuaStyle.h
@@ -12,7 +12,7 @@ class LuaStyle {
 public:
     LuaStyle() = default;
 
-    void ParseFromMap(std::map<std::string, std::string, std::less<>> &configMap);
+    void Parse(std::map<std::string, std::string, std::less<>> &configMap);
     // [basic]
     /*
      * 缩进风格
diff --git a/CodeFormatCore/include/CodeFormatCore/Format/Analyzer/FormatAnalyzerType.h b/CodeFormatCore/include/CodeFormatCore/Format/Analyzer/FormatAnalyzerType.h
@@ -6,8 +6,10 @@ enum class FormatAnalyzerType {
     IndentationAnalyzer,
     AlignAnalyzer,
     TokenAnalyzer,
-    FormatDocAnalyze,
     SemicolonAnalyzer,
+
+    // last
+    FormatDocAnalyze,
     Count,
 };
 
diff --git a/CodeFormatCore/include/CodeFormatCore/RangeFormat/RangeFormatBuilder.h b/CodeFormatCore/include/CodeFormatCore/RangeFormat/RangeFormatBuilder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Format/FormatBuilder.h"
+#include "CodeFormatCore/Format/FormatBuilder.h"
 
 class RangeFormatBuilder : public FormatBuilder {
 public:
diff --git a/CodeFormatCore/include/CodeFormatCore/TypeFormat/LuaTypeFormat.h b/CodeFormatCore/include/CodeFormatCore/TypeFormat/LuaTypeFormat.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../Format/FormatBuilder.h"
-#include "LuaTypeFormatOptions.h"
+#include "CodeFormatCore/Format/FormatBuilder.h"
+#include "LuaTypeFormatFeatures.h"
 
 class LuaTypeFormat {
 public:
@@ -10,13 +10,12 @@ class LuaTypeFormat {
         std::string Text;
     };
 
-    LuaTypeFormat(LuaTypeFormatOptions &typeOptions);
+    explicit LuaTypeFormat(LuaTypeFormatFeatures &features);
 
     void Analyze(
             std::string_view trigger, std::size_t line, std::size_t character,
             const LuaSyntaxTree &t,
-            LuaStyle &style
-    );
+            LuaStyle &style);
 
     std::vector<Result> GetResult();
 
@@ -29,19 +28,16 @@ class LuaTypeFormat {
                            std::size_t character,
                            const LuaParseError &luaError,
                            const LuaSyntaxTree &t,
-                           LuaStyle &style
-    );
+                           LuaStyle &style);
 
     void FormatLine(std::size_t line,
                     std::size_t character,
                     const LuaSyntaxTree &t,
-                    LuaStyle &style
-    );
+                    LuaStyle &style);
 
     void FormatByRange(FormatRange range,
                        const LuaSyntaxTree &t,
-                       LuaStyle &style
-    );
+                       LuaStyle &style);
 
     void FixIndent(std::size_t line,
                    std::size_t character,
@@ -50,7 +46,6 @@ class LuaTypeFormat {
 
     void FixEndIndent(std::size_t line, std::size_t character);
 
-    LuaTypeFormatOptions _typeOptions;
+    LuaTypeFormatFeatures _features;
     std::vector<Result> _results;
 };
- 
diff --git a/CodeFormatCore/include/CodeFormatCore/TypeFormat/LuaTypeFormatFeatures.h b/CodeFormatCore/include/CodeFormatCore/TypeFormat/LuaTypeFormatFeatures.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <map>
+#include <string>
+
+class LuaTypeFormatFeatures {
+public:
+    static LuaTypeFormatFeatures From(std::map<std::string, std::string, std::less<>> &features);
+
+    bool format_line = true;
+    bool auto_complete_end = true;
+    bool auto_complete_table_sep = true;
+    bool fix_indent = true;
+};
diff --git a/CodeFormatCore/include/CodeFormatCore/TypeFormat/LuaTypeFormatOptions.h b/CodeFormatCore/include/CodeFormatCore/TypeFormat/LuaTypeFormatOptions.h
diff --git a/CodeFormatCore/src/Config/LuaEditorConfig.cpp b/CodeFormatCore/src/Config/LuaEditorConfig.cpp
@@ -85,7 +85,7 @@ LuaStyle &LuaEditorConfig::Generate(std::string_view filePath) {
     auto &luaStyle = _styleMap.at(patternKey);
     for (auto i: patternSection) {
         auto &configMap = _sections[i].ConfigMap;
-        luaStyle.ParseFromMap(configMap);
+        luaStyle.Parse(configMap);
     }
 
     return luaStyle;
diff --git a/CodeFormatCore/src/Config/LuaStyle.cpp b/CodeFormatCore/src/Config/LuaStyle.cpp
@@ -24,7 +24,7 @@ bool IsNumber(std::string_view source) {
         op = std::stoi(configMap.at(#op));                     \
     }
 
-void LuaStyle::ParseFromMap(std::map<std::string, std::string, std::less<>> &configMap) {
+void LuaStyle::Parse(std::map<std::string, std::string, std::less<>> &configMap) {
     if (configMap.count("indent_style")) {
         if (configMap.at("indent_style") == "space") {
             indent_style = IndentStyle::Space;
diff --git a/CodeFormatCore/src/TypeFormat/LuaTypeFormat.cpp b/CodeFormatCore/src/TypeFormat/LuaTypeFormat.cpp
@@ -9,8 +9,8 @@ std::vector<LuaTypeFormat::Result> LuaTypeFormat::GetResult() {
     return _results;
 }
 
-LuaTypeFormat::LuaTypeFormat(LuaTypeFormatOptions &typeOptions)
-    : _typeOptions(typeOptions) {
+LuaTypeFormat::LuaTypeFormat(LuaTypeFormatFeatures &features)
+    : _features(features) {
 }
 
 void LuaTypeFormat::Analyze(std::string_view trigger,
@@ -43,11 +43,11 @@ void LuaTypeFormat::AnalyzeReturn(std::size_t line, std::size_t character, const
         return;
     }
 
-    if (_typeOptions.format_line) {
+    if (_features.format_line) {
         FormatLine(line, character, t, style);
     }
 
-    if (_typeOptions.fix_indent) {
+    if (_features.fix_indent) {
         FixIndent(line, character, t, style);
     }
 }
@@ -57,7 +57,7 @@ void LuaTypeFormat::CompleteMissToken(std::size_t line,
                                       const LuaParseError &luaError,
                                       const LuaSyntaxTree &t,
                                       LuaStyle &style) {
-    if (!_typeOptions.auto_complete_end) {
+    if (!_features.auto_complete_end) {
         return;
     }
     auto &result = _results.emplace_back();
@@ -178,7 +178,7 @@ void LuaTypeFormat::FormatLine(std::size_t line, std::size_t character, const Lu
             formatRange.StartLine = line - 1;
             formatRange.EndLine = line - 1;
 
-            if (_typeOptions.auto_complete_table_sep) {
+            if (_features.auto_complete_table_sep) {
                 tempStyle.trailing_table_separator = TrailingTableSeparator::Smart;
             }
 
diff --git a/CodeFormatCore/src/TypeFormat/LuaTypeFormatFeatures.cpp b/CodeFormatCore/src/TypeFormat/LuaTypeFormatFeatures.cpp
@@ -0,0 +1,20 @@
+#include "CodeFormatCore/TypeFormat/LuaTypeFormatFeatures.h"
+
+LuaTypeFormatFeatures
+LuaTypeFormatFeatures::From(std::map<std::string, std::string, std::less<>> &features) {
+    LuaTypeFormatFeatures formatFeatures;
+
+    if (features.count("auto_complete_end")) {
+        formatFeatures.auto_complete_end = features["auto_complete_end"] == "true";
+    }
+
+    if (features.count("format_line")) {
+        formatFeatures.format_line = features["format_line"] == "true";
+    }
+
+    if (features.count("auto_complete_table_sep")) {
+        formatFeatures.auto_complete_table_sep = features["auto_complete_table_sep"] == "true";
+    }
+
+    return formatFeatures;
+}
diff --git a/CodeFormatCore/src/TypeFormat/LuaTypeFormatOptions.cpp b/CodeFormatCore/src/TypeFormat/LuaTypeFormatOptions.cpp
diff --git a/CodeFormatLib/src/LuaCodeFormat.cpp b/CodeFormatLib/src/LuaCodeFormat.cpp
@@ -50,7 +50,7 @@ void LuaCodeFormat::RemoveCodeStyle(const std::string &workspaceUri) {
 void LuaCodeFormat::SetDefaultCodeStyle(ConfigMap &configMap) {
     if (!configMap.empty()) {
         LuaStyle style;
-        style.ParseFromMap(configMap);
+        style.Parse(configMap);
         _defaultStyle = style;
     }
 }
@@ -146,7 +146,7 @@ LuaCodeFormat::TypeFormat(const std::string &uri, std::size_t line, std::size_t
     LuaStyle style = GetStyle(uri);
     CalculateTempStyle(style, configMap);
 
-    LuaTypeFormatOptions typeFormatOptions = LuaTypeFormatOptions::ParseFromMap(stringTypeOptions);
+    LuaTypeFormatFeatures typeFormatOptions = LuaTypeFormatFeatures::From(stringTypeOptions);
 
     LuaTypeFormat tf(typeFormatOptions);
     tf.Analyze("\n", line, character, t, style);
diff --git a/CodeFormatServer/src/LSP/LSPHandle.cpp b/CodeFormatServer/src/LSP/LSPHandle.cpp
@@ -261,7 +261,7 @@ std::shared_ptr<lsp::Serializable> LSPHandle::OnTypeFormatting(
     auto &syntaxTree = opSyntaxTree.value();
     LuaStyle &luaStyle = _server->GetService<ConfigService>()->GetLuaStyle(params->textDocument.uri);
 
-    LuaTypeFormatOptions typeFormatOptions;
+    LuaTypeFormatFeatures typeFormatOptions;
     auto typeFormatResults = _server->GetService<FormatService>()->TypeFormat(
             "\n",
             params->position.line,
diff --git a/CodeFormatServer/src/LanguageServer.cpp b/CodeFormatServer/src/LanguageServer.cpp
@@ -1,28 +1,28 @@
 #include "LanguageServer.h"
-#include <iterator>
-#include <fstream>
-#include "Util/format.h"
-#include "Util/Url.h"
-#include "Util/FileFinder.h"
-#include "asio.hpp"
-#include "Service/Service.h"
 #include "Service/CodeActionService.h"
-#include "Service/FormatService.h"
-#include "Service/DiagnosticService.h"
-#include "Service/ConfigService.h"
 #include "Service/CommandService.h"
+#include "Service/ConfigService.h"
+#include "Service/DiagnosticService.h"
+#include "Service/FormatService.h"
+#include "Service/Service.h"
+#include "Util/FileFinder.h"
+#include "Util/Url.h"
+#include "Util/format.h"
+#include "asio.hpp"
+#include <fstream>
+#include <iterator>
 
 LanguageServer::LanguageServer()
-        : _idCounter(0),
-          _ioc(1),
-          _lspHandle(this) {
+    : _idCounter(0),
+      _ioc(1),
+      _lspHandle(this) {
 }
 
 void LanguageServer::InitializeService() {
     AddService<FormatService>();
     AddService<DiagnosticService>();
-	AddService<CommandService>();
-	AddService<CodeActionService>();
+    AddService<CommandService>();
+    AddService<CodeActionService>();
     AddService<ConfigService>();
 
     for (auto &service: _services) {
@@ -93,9 +93,8 @@ asio::io_context &LanguageServer::GetIOContext() {
     return _ioc;
 }
 
-uint64_t LanguageServer::GetRequestId()
-{
-	return ++_idCounter;
+uint64_t LanguageServer::GetRequestId() {
+    return ++_idCounter;
 }
 
 LSPHandle &LanguageServer::GetLSPHandle() {
diff --git a/CodeFormatServer/src/LanguageServer.h b/CodeFormatServer/src/LanguageServer.h
@@ -5,17 +5,16 @@
 #include <asio.hpp>
 #include <asio/io_context.hpp>
 
-#include "Session/IOSession.h"
 #include "CodeFormatCore/Config/LuaEditorConfig.h"
+#include "LSP/LSPHandle.h"
+#include "Service/Service.h"
 #include "Service/ServiceType.h"
+#include "Session/IOSession.h"
 #include "VFS/VirtualFile.h"
-#include "LSP/LSPHandle.h"
 #include "VFS/VirtualFileSystem.h"
-#include "Service/Service.h"
 
 template<class Derived>
-concept ServiceClass = requires(Derived d)
-{
+concept ServiceClass = requires(Derived d) {
     std::is_base_of<Service, Derived>::value;
     Derived::ServiceIndex;
 };
@@ -38,8 +37,8 @@ class LanguageServer {
 
     asio::io_context &GetIOContext();
 
-    template<ServiceClass Service, typename ... ARGS>
-    void AddService(ARGS &&... args);
+    template<ServiceClass Service, typename... ARGS>
+    void AddService(ARGS &&...args);
 
     template<ServiceClass Service>
     Service *GetService();
@@ -69,8 +68,8 @@ Service *LanguageServer::GetService() {
     return dynamic_cast<Service *>(_services[static_cast<std::size_t>(Service::ServiceIndex)].get());
 }
 
-template<ServiceClass Service, typename ... ARGS>
-void LanguageServer::AddService(ARGS &&... args) {
+template<ServiceClass Service, typename... ARGS>
+void LanguageServer::AddService(ARGS &&...args) {
     auto index = Service::ServiceIndex;
     auto service = std::make_unique<Service>(this, std::forward<ARGS &&>(args)...);
     _services[static_cast<std::size_t>(index)] = std::move(service);
diff --git a/CodeFormatServer/src/Service/FormatService.cpp b/CodeFormatServer/src/Service/FormatService.cpp
@@ -32,7 +32,7 @@ FormatService::TypeFormat(std::string_view trigger,
                           std::size_t character,
                           LuaSyntaxTree &luaSyntaxTree,
                           LuaStyle &luaStyle,
-                          LuaTypeFormatOptions &typeOptions) {
+                          LuaTypeFormatFeatures &typeOptions) {
     LuaTypeFormat tf(typeOptions);
     tf.Analyze(trigger, line, character, luaSyntaxTree, luaStyle);
     return tf.GetResult();
diff --git a/CodeFormatServer/src/Service/FormatService.h b/CodeFormatServer/src/Service/FormatService.h
@@ -27,5 +27,5 @@ class FormatService : public Service {
             std::size_t character,
             LuaSyntaxTree &luaSyntaxTree,
             LuaStyle &luaStyle,
-            LuaTypeFormatOptions &typeOptions);
+            LuaTypeFormatFeatures &typeOptions);
 };
diff --git a/CodeFormatServer/src/Session/IOSession.cpp b/CodeFormatServer/src/Session/IOSession.cpp
diff --git a/CodeFormatServer/src/Session/Protocol/ProtocolBuffer.cpp b/CodeFormatServer/src/Session/Protocol/ProtocolBuffer.cpp
diff --git a/CodeFormatServer/src/Session/Protocol/ProtocolBuffer.h b/CodeFormatServer/src/Session/Protocol/ProtocolBuffer.h
diff --git a/CodeFormatServer/src/Session/Protocol/ProtocolParser.cpp b/CodeFormatServer/src/Session/Protocol/ProtocolParser.cpp
diff --git a/CodeFormatServer/src/Session/Protocol/ProtocolParser.h b/CodeFormatServer/src/Session/Protocol/ProtocolParser.h
diff --git a/CodeFormatServer/src/main.cpp b/CodeFormatServer/src/main.cpp

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ void LuaFormat::SetDefaultStyle(std::map<std::string, std::string, std::less<>>`
`138`	`138`	`if (keyValues.empty()) {`
`139`	`139`	`return;`
`140`	`140`	`}`
`141`		`- _defaultStyle.ParseFromMap(keyValues);`
	`141`	`+ _defaultStyle.Parse(keyValues);`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`bool LuaFormat::Reformat() {`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ LuaStyle &LuaEditorConfig::Generate(std::string_view filePath) {`
`85`	`85`	`auto &luaStyle = _styleMap.at(patternKey);`
`86`	`86`	`for (auto i: patternSection) {`
`87`	`87`	`auto &configMap = _sections[i].ConfigMap;`
`88`		`- luaStyle.ParseFromMap(configMap);`
	`88`	`+ luaStyle.Parse(configMap);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`return luaStyle;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ bool IsNumber(std::string_view source) {`
`24`	`24`	`op = std::stoi(configMap.at(#op)); \`
`25`	`25`	`}`
`26`	`26`
`27`		`-void LuaStyle::ParseFromMap(std::map<std::string, std::string, std::less<>> &configMap) {`
	`27`	`+void LuaStyle::Parse(std::map<std::string, std::string, std::less<>> &configMap) {`
`28`	`28`	`if (configMap.count("indent_style")) {`
`29`	`29`	`if (configMap.at("indent_style") == "space") {`
`30`	`30`	`indent_style = IndentStyle::Space;`