From b7ba232b5674471b06e63acf9dc3a6638cc87da8 Mon Sep 17 00:00:00 2001
From: Matts966 <Matts966@users.noreply.github.com>
Date: Mon, 25 Apr 2022 03:02:02 +0900
Subject: [PATCH] Check newline

---
 zetasql/parser/unparser.cc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/zetasql/parser/unparser.cc b/zetasql/parser/unparser.cc
index 1e0cafc02..2cddfd1dc 100644
--- a/zetasql/parser/unparser.cc
+++ b/zetasql/parser/unparser.cc
@@ -55,10 +55,16 @@ std::string UnparseWithComments(const ASTNode* node, std::deque<std::pair<std::s
   // 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) {
-    unparser.println(parse_token.first);
+    if (parse_token.first.find("\n") != std::string::npos) {
+      newline_emitted = true;
+    }
+    unparser.print(parse_token.first);
+  }
+  if (!newline_emitted) {
+    unparser.FlushLine();
   }
-  unparser.FlushLine();
   return unparsed_;
 }