完成1.0.0单元测试

Author: CppCXY

CHANGELOG.md

@@ -1,10 +1,34 @@
 # Change Log
 
-## 0.17.0
+## 1.0.0
 
-`NEW` 支持配置table的分隔符风格是逗号还是分号还是不处理
+`EmmyLuaCodeStyle`经过一年的更新现在进入正式版
 
-`NEW` 支持通过配置移除或者保留或者新增表的尾部分隔符
+`Refactor` 大部分代码重写, 数据结构重新设计
+
+`Refactor` 大部分选项被重新命名, 新增了一批选项, 移除了一批选项
+
+`Performance` 得益于从头开始重新设计, 格式化性能提高三倍, 在windows上一般的机器上格式化`10w`行代码仅需1到2秒 
+
+## 0.18.0
+
+`FIX` typeformat不会在字符串或者长注释内部做格式化行为
+
+以下由[@obszczymucha](https://github.com/obszczymucha)实现:
+
+`NEW` 支持选项
+* `space_inside_function_call_parentheses`
+* `space_inside_function_param_list_parentheses`
+* `space_inside_square_brackets`
+
+
+## 0.17.2
+
+`NEW` typeformat会智能填补表项之后的逗号
+
+`NEW` 支持选项`table_separator_style` 可选值为`none/comma/semicolon`
+
+`NEW` 支持选项`trailing_table_separator` 可选值为 `keep/never/always/smart`
 
 ## 0.16.1
 

CMakeSettings.json

@@ -141,13 +141,7 @@ void LuaStyle::ParseFromMap(std::map<std::string, std::string, std::less<>> &con
 
     BOOL_OPTION(space_around_concat_operator)
 
-    if (configMap.count("align_call_args")) {
-        if (configMap.at("align_call_args") == "none") {
-            align_call_args = AlignCallArgs::None;
-        } else if (configMap.at("align_call_args") == "normal") {
-            align_call_args = AlignCallArgs::Normal;
-        }
-    }
+    BOOL_OPTION(align_call_args)
 
     BOOL_OPTION(align_function_params)
 

CodeService/src/Config/LuaStyle.cpp

@@ -33,7 +33,7 @@ void AlignAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                     break;
                 }
                 case LuaSyntaxNodeKind::CallExpression: {
-                    if (f.GetStyle().align_call_args != AlignCallArgs::None) {
+                    if (f.GetStyle().align_call_args) {
                         auto exprlist = syntaxNode.GetChildSyntaxNode(LuaSyntaxNodeKind::ExpressionList, t);
                         AnalyzeExpressionList(f, exprlist, t);
                     }

CodeService/src/Format/Analyzer/AlignAnalyzer.cpp

@@ -48,9 +48,10 @@ void SpaceAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                 case '~': {
                     auto p = syntaxNode.GetParent(t);
                     if (p.IsNode(t) && p.GetSyntaxKind(t) == LuaSyntaxNodeKind::BinaryExpression) {
-                        SpaceAround(syntaxNode, t);
+                        SpaceAround(syntaxNode, t, f.GetStyle().space_around_math_operator ? 1 : 0);
                     } else {
                         SpaceLeft(syntaxNode, t);
+                        SpaceRight(syntaxNode, t, 0);
                     }
                     break;
                 }
@@ -304,28 +305,15 @@ void SpaceAnalyzer::SpaceAround(LuaSyntaxNode &n, const LuaSyntaxTree &t, std::s
 }
 
 void SpaceAnalyzer::SpaceLeft(LuaSyntaxNode &n, const LuaSyntaxTree &t, std::size_t space) {
-    auto token = n.GetFirstToken(t);
-
-    _leftSpaces[token.GetIndex()] = space;
+    auto token = n.GetPrevToken(t);
+    _rightSpaces[token.GetIndex()] = space;
 }
 
 void SpaceAnalyzer::SpaceRight(LuaSyntaxNode &n, const LuaSyntaxTree &t, std::size_t space) {
     auto token = n.GetLastToken(t);
     _rightSpaces[token.GetIndex()] = space;
 }
 
-std::optional<std::size_t> SpaceAnalyzer::GetLeftSpace(LuaSyntaxNode &n) const {
-    if (_ignoreSpace.count(n.GetIndex())) {
-        return {};
-    }
-
-    auto it = _leftSpaces.find(n.GetIndex());
-    if (it == _leftSpaces.end()) {
-        return {};
-    }
-    return it->second;
-}
-
 std::optional<std::size_t> SpaceAnalyzer::GetRightSpace(LuaSyntaxNode &n) const {
     if (_ignoreSpace.count(n.GetIndex())) {
         return {};
@@ -341,17 +329,8 @@ std::optional<std::size_t> SpaceAnalyzer::GetRightSpace(LuaSyntaxNode &n) const
 std::size_t
 SpaceAnalyzer::ProcessSpace(const LuaSyntaxTree &t, LuaSyntaxNode &left, LuaSyntaxNode &right) {
     auto rightSpaceOfLeftToken = GetRightSpace(left);
-    auto leftSpaceOfRightToken = GetLeftSpace(right);
-    std::optional<std::size_t> distance;
-    if (!rightSpaceOfLeftToken.has_value()) {
-        distance = leftSpaceOfRightToken;
-    } else if (!leftSpaceOfRightToken.has_value()) {
-        distance = rightSpaceOfLeftToken;
-    } else {
-        distance = leftSpaceOfRightToken;
-    }
-    if (distance.has_value()) {
-        return distance.value();
+    if (rightSpaceOfLeftToken.has_value()) {
+        return rightSpaceOfLeftToken.value();
     }
     if (!right.IsNull(t)) {
         return t.GetStartOffset(right.GetIndex()) - t.GetEndOffset(left.GetIndex()) - 1;