commit 318fbeb972290cda15e68d0262c0af122b277bce
author Sam McCall <sam.mccall@gmail.com> Thu Nov 30 23:21:34 2017 +0000
committer Sam McCall <sam.mccall@gmail.com> Thu Nov 30 23:21:34 2017 +0000
tree 60e0abfeefdf0b891c2112f136b1dcc2e263b3ee
parent fae3b02520ae936f3e9ee55e8e1a9bf0bc594e9a

[clangd] Logger implicitly adds newline

llvm-svn: 319497

clang-tools-extra/clangd/JSONRPCDispatcher.cpp

diff --git a/clang-tools-extra/clangd/JSONRPCDispatcher.cpp b/clang-tools-extra/clangd/JSONRPCDispatcher.cpp
index 29dc50c..69ba2e1 100644
--- a/clang-tools-extra/clangd/JSONRPCDispatcher.cpp
+++ b/clang-tools-extra/clangd/JSONRPCDispatcher.cpp
@@ -41,7 +41,7 @@
 void JSONOutput::log(const Twine &Message) {
   trace::log(Message);
   std::lock_guard<std::mutex> Guard(StreamMutex);
-  Logs << Message;
+  Logs << Message << '\n';
   Logs.flush();
 }
 
@@ -55,7 +55,7 @@
 
 void RequestContext::reply(json::Expr &&Result) {
   if (!ID) {
-    Out.log("Attempted to reply to a notification!\n");
+    Out.log("Attempted to reply to a notification!");
     return;
   }
   SPAN_ATTACH(tracer(), "Reply", Result);
@@ -68,7 +68,7 @@
 
 void RequestContext::replyError(ErrorCode code,
                                 const llvm::StringRef &Message) {
-  Out.log("Error " + Twine(static_cast<int>(code)) + ": " + Message + "\n");
+  Out.log("Error " + Twine(static_cast<int>(code)) + ": " + Message);
   SPAN_ATTACH(tracer(), "Error",
               (json::obj{{"code", static_cast<int>(code)},
                          {"message", Message.str()}}));
@@ -166,7 +166,7 @@
         if (ContentLength != 0) {
           Out.log("Warning: Duplicate Content-Length header received. "
                   "The previous value for this message (" +
-                  std::to_string(ContentLength) + ") was ignored.\n");
+                  std::to_string(ContentLength) + ") was ignored.");
         }
 
         llvm::getAsUnsignedInteger(LineRef.trim(), 0, ContentLength);
@@ -186,7 +186,7 @@
     if (ContentLength > 1 << 30) { // 1024M
       In.ignore(ContentLength);
       Out.log("Skipped overly large message of " + Twine(ContentLength) +
-              " bytes.\n");
+              " bytes.");
       continue;
     }
 
@@ -202,7 +202,7 @@
         if (!In) {
           Out.log("Input was aborted. Read only " +
                   std::to_string(In.gcount()) + " bytes of expected " +
-                  std::to_string(ContentLength) + ".\n");
+                  std::to_string(ContentLength) + ".");
           break;
         }
 
@@ -211,15 +211,15 @@
 
       if (auto Doc = json::parse(JSONRef)) {
         // Log the formatted message.
-        Out.log(llvm::formatv(Out.Pretty ? "<-- {0:2}\n" : "<-- {0}\n", *Doc));
+        Out.log(llvm::formatv(Out.Pretty ? "<-- {0:2}" : "<-- {0}", *Doc));
         // Finally, execute the action for this JSON message.
         if (!Dispatcher.call(*Doc, Out))
-          Out.log("JSON dispatch failed!\n");
+          Out.log("JSON dispatch failed!");
       } else {
         // Parse error. Log the raw message.
-        Out.log("<-- " + JSONRef + "\n");
+        Out.log("<-- " + JSONRef);
         Out.log(llvm::Twine("JSON parse error: ") +
-                llvm::toString(Doc.takeError()) + "\n");
+                llvm::toString(Doc.takeError()));
       }
 
       // If we're done, exit the loop.
@@ -227,7 +227,7 @@
         break;
     } else {
       Out.log("Warning: Missing Content-Length header, or message has zero "
-              "length.\n");
+              "length.");
     }
   }
 }