SemicolonAnalyzer: don't reformat if there's nothing to do

Author: AndreaWalchshoferSCCH

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

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

CodeFormatCore/src/Format/Analyzer/SemicolonAnalyzer.cpp

@@ -2,6 +2,7 @@
 #include "CodeFormatCore/Config/LuaStyleEnum.h"
 #include "CodeFormatCore/Format/FormatState.h"
 #include "LuaParser/Lexer/LuaTokenTypeDetail.h"
+#include <iostream>
 
 SemicolonAnalyzer::SemicolonAnalyzer() {
 }
@@ -25,12 +26,15 @@ void SemicolonAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                         break;
                     }
                     case EndStmtWithSemicolon::Never: {
-                        // 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);
+                        // 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);
+                            }
                         }
                         break;
                     }
@@ -83,6 +87,8 @@ 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;
@@ -123,6 +129,10 @@ bool SemicolonAnalyzer::EndsWithSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &
     return token.GetTokenKind(t) == ';';
 }
 
+bool SemicolonAnalyzer::ContainsSemicolon(LuaSyntaxNode n, const LuaSyntaxTree& t) {
+    return n.GetChildTokens(';', t).size() > 0;
+}
+
 LuaSyntaxNode SemicolonAnalyzer::GetLastNonCommentToken(LuaSyntaxNode n, const LuaSyntaxTree &t) {
     auto token = n.GetLastToken(t);
     switch (token.GetTokenKind(t)) {