Skip to content

Commit e2f3af2

Browse files
committed
Fix redundant newline
1 parent 1936b9e commit e2f3af2

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

zetasql/parser/unparser.cc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,19 @@ std::string Unparse(const ASTNode* node) {
5050

5151
std::string UnparseWithComments(const ASTNode* node, std::deque<std::pair<std::string,
5252
ParseLocationPoint>>& parse_tokens) {
53-
std::string unparsed_;
54-
parser::Unparser unparser(&unparsed_);
53+
std::string unparsed;
54+
parser::Unparser unparser(&unparsed);
5555
// Print comments by visitors and pop.
5656
node->Accept(&unparser, &parse_tokens);
5757
// Emit left comments in parse_tokens.
5858
for (const auto& parse_token : parse_tokens) {
5959
unparser.print(parse_token.first);
6060
}
6161
unparser.FlushLine();
62-
return unparsed_;
62+
while (unparsed.back() == '\n' && unparsed.at(unparsed.size() - 2) == '\n') {
63+
unparsed.pop_back();
64+
}
65+
return unparsed;
6366
}
6467

6568
namespace parser {

zetasql/tools/zetasql-formatter/example_tests_formatted/missing_comment.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ FROM
88
fuga
99
ON hoge.hoge = fuga.fuga;
1010
-- comment3
11-

0 commit comments

Comments
 (0)