close #135

Author: CppCXY

CodeFormatCore/include/CodeFormatCore/Config/LuaStyle.h

@@ -87,6 +87,10 @@ class LuaStyle {
 
     bool space_around_concat_operator = true;
 
+    bool space_around_logical_operator = true;
+
+    bool space_around_assign_operator = true;
+
     // [Align]
     bool align_call_args = false;
 

CodeFormatCore/src/Config/LuaStyle.cpp

@@ -160,6 +160,10 @@ void LuaStyle::Parse(std::map<std::string, std::string, std::less<>> &configMap)
 
     BOOL_OPTION(space_around_concat_operator)
 
+    BOOL_OPTION(space_around_logical_operator)
+
+    BOOL_OPTION(space_around_assign_operator)
+
     BOOL_OPTION(align_call_args)
 
     BOOL_OPTION(align_function_params)

CodeFormatCore/src/Format/Analyzer/AlignAnalyzer.cpp

@@ -376,7 +376,8 @@ void AlignAnalyzer::ResolveAlignGroup(FormatState &f, std::size_t groupIndex, Al
                     auto eq = node.GetChildToken('=', t);
                     if (eq.IsToken(t)) {
                         auto prev = eq.GetPrevToken(t);
-                        auto newPos = prev.GetTextRange(t).GetEndOffset() + 2 - node.GetTextRange(t).StartOffset;
+                        auto prevSpace = f.GetStyle().space_around_assign_operator ? 2 : 1;
+                        auto newPos = prev.GetTextRange(t).GetEndOffset() + prevSpace - node.GetTextRange(t).StartOffset;
                         if (newPos > maxDis) {
                             maxDis = newPos;
                         }
@@ -398,7 +399,8 @@ void AlignAnalyzer::ResolveAlignGroup(FormatState &f, std::size_t groupIndex, Al
                     if (file.CheckCurrentLineUnicodeBefore(eq.GetTextRange(t).StartOffset)) {
                         return;
                     }
-                    auto newPos = prev.GetTextRange(t).GetEndOffset() + 2 - node.GetTextRange(t).StartOffset;
+                    auto prevSpace = f.GetStyle().space_around_assign_operator ? 2 : 1;
+                    auto newPos = prev.GetTextRange(t).GetEndOffset() + prevSpace - node.GetTextRange(t).StartOffset;
                     if (newPos > maxDis) {
                         maxDis = newPos;
                     }

CodeFormatCore/src/Format/Analyzer/SpaceAnalyzer.cpp

@@ -29,13 +29,19 @@ void SpaceAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                     SpaceAround(syntaxNode, t, f.GetStyle().space_around_concat_operator ? 1 : 0);
                     break;
                 }
-                case '=':
-                case TK_AND:
-                case TK_OR:
+                case '=': {
+                    SpaceAround(syntaxNode, t, f.GetStyle().space_around_assign_operator ? 1 : 0);
+                    break;
+                }
                 case TK_GE:
                 case TK_LE:
                 case TK_NE:
-                case TK_EQ:
+                case TK_EQ: {
+                    SpaceAround(syntaxNode, t, f.GetStyle().space_around_logical_operator ? 1 : 0);
+                    break;
+                }
+                case TK_AND:
+                case TK_OR:
                 case TK_IN: {
                     SpaceAround(syntaxNode, t, 1);
                     break;
@@ -60,7 +66,7 @@ void SpaceAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                 case '>': {
                     auto p = syntaxNode.GetParent(t);
                     if (p.GetSyntaxKind(t) == LuaSyntaxNodeKind::BinaryExpression) {
-                        SpaceAround(syntaxNode, t);
+                        SpaceAround(syntaxNode, t, f.GetStyle().space_around_logical_operator ? 1 : 0);
                     } else if (syntaxNode.GetTokenKind(t) == '<') {
                         SpaceRight(syntaxNode, t, 0);
                     } else {

Test/src/FormatStyle_unitest.cpp

@@ -1794,3 +1794,62 @@ end
 )",
             style));
 }
+TEST(FormatByStyleOption, space_around_assign_operator) {
+    LuaStyle style;
+
+    style.space_around_assign_operator = true;
+    EXPECT_TRUE(TestHelper::TestFormatted(
+            R"(
+local t = 123
+local d = {
+    d = 123
+}
+)",
+            R"(
+local t = 123
+local d = {
+    d = 123
+}
+)",
+            style));
+
+    style.space_around_assign_operator = false;
+    EXPECT_TRUE(TestHelper::TestFormatted(
+            R"(
+local t = 123
+local d = {
+    d = 123
+}
+)",
+            R"(
+local t=123
+local d={
+    d=123
+}
+)",
+            style));
+}
+
+TEST(FormatByStyleOption, space_around_logical_operator) {
+    LuaStyle style;
+
+    style.space_around_logical_operator = true;
+    EXPECT_TRUE(TestHelper::TestFormatted(
+            R"(
+local t = true == false or a < 2 and b > 3 or c <= 4 and d >= 5 or e ~= 6 and f == 7
+)",
+            R"(
+local t = true == false or a < 2 and b > 3 or c <= 4 and d >= 5 or e ~= 6 and f == 7
+)",
+            style));
+
+    style.space_around_logical_operator = false;
+    EXPECT_TRUE(TestHelper::TestFormatted(
+            R"(
+local t = true == false or a < 2 and b > 3 or c <= 4 and d >= 5 or e ~= 6 and f == 7
+)",
+            R"(
+local t = true==false or a<2 and b>3 or c<=4 and d>=5 or e~=6 and f==7
+)",
+            style));
+}