Change logic of inserting linebreaks

Author: AndreaWalchshoferSCCH

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

@@ -18,6 +18,7 @@ class SemicolonAnalyzer : public FormatAnalyzer {
 private:
     void AddSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t);
     void InsertNewLineBeforeNode(LuaSyntaxNode n, const LuaSyntaxTree &t);
+    void InsertNewLineBeforeNextNode(LuaSyntaxNode n, const LuaSyntaxTree& t);
     void RemoveSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t);
     bool IsFirstStmtOfLine(LuaSyntaxNode n, const LuaSyntaxTree &t);
     bool IsLastStmtOfLine(LuaSyntaxNode n, const LuaSyntaxTree &t);

CodeFormatCore/src/Format/Analyzer/SemicolonAnalyzer.cpp

@@ -28,12 +28,9 @@ void SemicolonAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                     case EndStmtWithSemicolon::Never: {
                         // no action needed when there's no semicolons at all!
                         if (ContainsSemicolon(syntaxNode, t)) {
-                            // is on same line as other statement -> needs to go on new line
-                            if (!IsFirstStmtOfLine(syntaxNode, t)) {
-                                InsertNewLineBeforeNode(syntaxNode, t);
-                            }
                             if (EndsWithSemicolon(syntaxNode, t)) {
                                 RemoveSemicolon(syntaxNode, t);
+                                InsertNewLineBeforeNextNode(syntaxNode, t);
                             }
                         }
                         break;
@@ -87,31 +84,26 @@ void SemicolonAnalyzer::AddSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t) {
 }
 
 void SemicolonAnalyzer::InsertNewLineBeforeNode(LuaSyntaxNode n, const LuaSyntaxTree &t) {
-    std::cout << "Called InsertNewLineBeforeNode" << std::endl;
-    std::cout << n.GetText(t) << std::endl;
     auto token = n.GetFirstToken(t); // line breaks are put in front of the statement itself by non-first statements
     if (token.IsToken(t)) {
         _semicolon[token.GetIndex()] = SemicolonStrategy::InsertNewLine;
     }
 }
 
+void SemicolonAnalyzer::InsertNewLineBeforeNextNode(LuaSyntaxNode n, const LuaSyntaxTree& t) {
+    auto token = n.GetNextTokenSkipComment(t);
+    if (token.IsToken(t) && token.GetStartLine(t) == n.GetEndLine(t)) {
+        _semicolon[token.GetIndex()] = SemicolonStrategy::InsertNewLine;
+    }
+}
+
 void SemicolonAnalyzer::RemoveSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t) {
     auto token = GetLastNonCommentToken(n, t);
     if (token.IsToken(t)) {
         _semicolon[token.GetIndex()] = SemicolonStrategy::Remove;
     }
 }
 
-bool SemicolonAnalyzer::IsFirstStmtOfLine(LuaSyntaxNode n, const LuaSyntaxTree &t) {
-    // check if current stmt starts on same line as the previous one ends
-    auto startCurrent = n.GetStartLine(t);
-    auto prev = n.GetPrevToken(t);
-    if (!prev.IsNull(t)) {
-        auto endPrev = prev.GetEndLine(t);
-        return endPrev < startCurrent;
-    }
-    return true;// there's no previous token
-}
 
 bool SemicolonAnalyzer::IsLastStmtOfLine(LuaSyntaxNode n, const LuaSyntaxTree &t) {
     // check if next stmt starts on same line as the current one ends