end_with_semicolon support never

Author: CppCXY

CodeFormatCore/include/CodeFormatCore/Config/LuaStyleEnum.h

@@ -89,7 +89,8 @@ enum class EndStmtWithSemicolon {
     Keep,
     ReplaceWithNewline,
     Always,
-    SameLine
+    SameLine,
+    Never
 };
 
 enum class BreakTableList {

CodeFormatCore/include/CodeFormatCore/Format/Analyzer/SemicolonAnalyzer.h

@@ -23,6 +23,7 @@ class SemicolonAnalyzer : public FormatAnalyzer {
     bool EndsWithSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t);
     bool ContainsSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t);
     LuaSyntaxNode GetLastNonCommentToken(LuaSyntaxNode n, const LuaSyntaxTree &t);
+    bool CanCorrectRemoveSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t);
 
     std::unordered_map<std::size_t, SemicolonStrategy> _semicolon;
 };

CodeFormatCore/src/Config/LuaStyle.cpp

@@ -313,6 +313,8 @@ void LuaStyle::Parse(std::map<std::string, std::string, std::less<>> &configMap)
             end_statement_with_semicolon = EndStmtWithSemicolon::ReplaceWithNewline;
         } else if (configMap.at("end_statement_with_semicolon") == "same_line") {
             end_statement_with_semicolon = EndStmtWithSemicolon::SameLine;
+        } else if (configMap.at("end_statement_with_semicolon") == "never") {
+            end_statement_with_semicolon = EndStmtWithSemicolon::Never;
         }
     }
 }

CodeFormatCore/src/Format/Analyzer/LineBreakAnalyzer.cpp

@@ -42,7 +42,7 @@ void LineBreakAnalyzer::ComplexAnalyze(FormatState &f, const LuaSyntaxTree &t) {
             switch (syntaxNode.GetSyntaxKind(t)) {
                 case LuaSyntaxNodeKind::Block: {
                     auto children = syntaxNode.GetChildren(t);
-                    if (syntaxNode.GetParent(t).IsSingleLineNode(t)) {
+                    if (syntaxNode.IsSingleLineNode(t)) {
                         if (children.size() <= 1) {
                             auto spaceAnalyzer = f.GetAnalyzer<SpaceAnalyzer>();
                             spaceAnalyzer->SpaceAround(syntaxNode, t);

CodeFormatCore/src/Format/Analyzer/SemicolonAnalyzer.cpp

@@ -42,6 +42,12 @@ void SemicolonAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                         }
                         break;
                     }
+                    case EndStmtWithSemicolon::Never: {
+                        if (CanCorrectRemoveSemicolon(syntaxNode, t)) {
+                            RemoveSemicolon(syntaxNode, t);
+                        }
+                        break;
+                    }
                     default: {
                         break;
                     }
@@ -129,3 +135,21 @@ LuaSyntaxNode SemicolonAnalyzer::GetLastNonCommentToken(LuaSyntaxNode n, const L
         }
     }
 }
+
+bool SemicolonAnalyzer::CanCorrectRemoveSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t) {
+    if(!EndsWithSemicolon(n, t)){
+        return false;
+    }
+    auto semicolon = GetLastNonCommentToken(n, t);
+    auto nextToken = semicolon.GetNextToken(t);
+    if(n.GetEndLine(t) == nextToken.GetStartLine(t)){
+        return false;
+    }
+
+    auto nextTokenKind = nextToken.GetTokenKind(t);
+    if (nextTokenKind == '{' || nextTokenKind == '(') {
+        return false;
+    }
+
+    return true;
+}

Test/src/FormatResult_unitest.cpp

@@ -1125,4 +1125,4 @@ only_latin = {
     { 'e',    nil },
 }
 )", style));
-}
+}

Test/src/FormatStyle_unitest.cpp

@@ -1682,6 +1682,19 @@ for i, v in ipairs(values) do
     end
 end
 local table1 = { 1, 2, 3 }
+)",
+            style));
+    style.end_statement_with_semicolon = EndStmtWithSemicolon::Never;
+    EXPECT_TRUE(TestHelper::TestFormatted(
+            R"(
+local t = pp;
+("aa"):foramt()
+local d = {};
+)",
+            R"(
+local t = pp;
+("aa"):foramt()
+local d = {}
 )",
             style));
 }

lua.template.editorconfig

@@ -145,9 +145,10 @@ break_all_list_when_line_exceed = false
 auto_collapse_lines = false
 
 break_before_braces = false
+
 # [preference]
 ignore_space_after_colon = false
 
 remove_call_expression_list_finish_comma = false
-# keep / always / same_line / repalce_with_newline
+# keep / always / same_line / replace_with_newline / never
 end_statement_with_semicolon = keep