Try pop

Matts966 · Apr 24, 2022 · d39018d · d39018d
1 parent b7ba232
commit d39018d
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/zetasql/parser/unparser.cc b/zetasql/parser/unparser.cc
@@ -50,22 +50,19 @@ std::string Unparse(const ASTNode* node) {
 
 std::string UnparseWithComments(const ASTNode* node, std::deque<std::pair<std::string,
                                 ParseLocationPoint>>& parse_tokens) {
-  std::string unparsed_;
-  parser::Unparser unparser(&unparsed_);
+  std::string unparsed;
+  parser::Unparser unparser(&unparsed);
   // Print comments by visitors and pop.
   node->Accept(&unparser, &parse_tokens);
   // Emit left comments in parse_tokens.
-  bool newline_emitted = false;
   for (const auto& parse_token : parse_tokens) {
-    if (parse_token.first.find("\n") != std::string::npos) {
-      newline_emitted = true;
-    }
     unparser.print(parse_token.first);
   }
-  if (!newline_emitted) {
-    unparser.FlushLine();
+  unparser.FlushLine();
+  while (unparsed.back() == '\n' && unparsed.at(unparsed.size() - 2) == '\n') {
+    unparsed.pop_back();
   }
-  return unparsed_;
+  return unparsed;
 }
 
 namespace parser {