Skip to content

Commit 04c7b8c

Browse files
Clean up changes
1 parent ce7e6b1 commit 04c7b8c

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ class SemicolonAnalyzer : public FormatAnalyzer {
1717

1818
private:
1919
void AddSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t);
20-
void InsertNewLineBeforeNextNode(LuaSyntaxNode n, const LuaSyntaxTree& t);
20+
void InsertNewLineBeforeNextNode(LuaSyntaxNode n, const LuaSyntaxTree &t);
2121
void RemoveSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t);
2222
bool IsLastStmtOfLine(LuaSyntaxNode n, const LuaSyntaxTree &t);
2323
bool EndsWithSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t);
24-
bool ContainsSemicolon(LuaSyntaxNode n, const LuaSyntaxTree& t);
24+
bool ContainsSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t);
2525
LuaSyntaxNode GetLastNonCommentToken(LuaSyntaxNode n, const LuaSyntaxTree &t);
2626

2727
std::unordered_map<std::size_t, SemicolonStrategy> _semicolon;

CodeFormatCore/src/Format/Analyzer/SemicolonAnalyzer.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include "CodeFormatCore/Config/LuaStyleEnum.h"
33
#include "CodeFormatCore/Format/FormatState.h"
44
#include "LuaParser/Lexer/LuaTokenTypeDetail.h"
5-
#include <iostream>
65

76
SemicolonAnalyzer::SemicolonAnalyzer() {
87
}
@@ -18,7 +17,7 @@ void SemicolonAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
1817
switch (f.GetStyle().end_statement_with_semicolon) {
1918
case EndStmtWithSemicolon::Always: {
2019
if (syntaxNode.GetSyntaxKind(t) == LuaSyntaxNodeKind::LabelStatement) {
21-
break; // labels should not end with semicolons
20+
break;// labels should not end with semicolons
2221
}
2322
if (!EndsWithSemicolon(syntaxNode, t)) {
2423
AddSemicolon(syntaxNode, t);
@@ -83,7 +82,7 @@ void SemicolonAnalyzer::AddSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t) {
8382
}
8483
}
8584

86-
void SemicolonAnalyzer::InsertNewLineBeforeNextNode(LuaSyntaxNode n, const LuaSyntaxTree& t) {
85+
void SemicolonAnalyzer::InsertNewLineBeforeNextNode(LuaSyntaxNode n, const LuaSyntaxTree &t) {
8786
auto token = n.GetNextTokenSkipComment(t);
8887
if (token.IsToken(t) && token.GetStartLine(t) == n.GetEndLine(t)) {
8988
_semicolon[token.GetIndex()] = SemicolonStrategy::InsertNewLine;
@@ -113,7 +112,7 @@ bool SemicolonAnalyzer::EndsWithSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &
113112
return token.GetTokenKind(t) == ';';
114113
}
115114

116-
bool SemicolonAnalyzer::ContainsSemicolon(LuaSyntaxNode n, const LuaSyntaxTree& t) {
115+
bool SemicolonAnalyzer::ContainsSemicolon(LuaSyntaxNode n, const LuaSyntaxTree &t) {
117116
return n.GetChildTokens(';', t).size() > 0;
118117
}
119118

0 commit comments

Comments
 (0)