[clangd][tests] Fix handling of EOF in delimited input

[jkorous]

Summary

Request in delimited input ended by EOF shouldn't be an error state.
Comments should be allowed at the end of test files.
Input mirroring should work for the last request in delimited test file.

[jkorous]

Hi Sam, could you please take a look at this minor fix?

[sammccall]

I can't see the bug/change related to "Comments should be allowed at the end of test files." can you elaborate?

clangd/delimited-input-comment-at-the-end.test

8

I'd actually lean towards dropping this test.
It's asserting that a magic string isn't present, and this patch removes the only occurrence of the magic string from the code. I like the drive to test every change, but it's hard to see this one ever failing :-)

(if you need a test with a trailing comment, maybe just throw one on the test from the other patch and call it delimited.test)?

[jkorous]

Include the correct test.

[jkorous]

By "Comments should be allowed at the end of test files." I meant that we shouldn't log it as an exceptional state. Should've worded that better.

I included a wrong test in the patch. I had realized the same thing as you and had written another test but messed up.

[jkorous]

I forgot to mention review in commit message.

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@330608 91177308-0d34-0410-b5e6-96231b3b80d8

JSONRPCDispatcher.cpp

static llvm::Optional<std::string> readDelimitedMessage(std::istream &In,
   std::string Line;
   while (std::getline(In, Line)) {
     Line.push_back('\n'); // getline() consumed the newline.
 
     auto LineRef = llvm::StringRef(Line).trim();
     if (LineRef.startswith("#")) // comment
       continue;
 
-    bool IsDelim = LineRef.find_first_not_of('-') == llvm::StringRef::npos;
-    if (!IsDelim) // Line is part of a JSON message.
-      JSON += Line;
-    if (IsDelim) {
-      Out.mirrorInput(
-          llvm::formatv("Content-Length: {0}\r\n\r\n{1}", JSON.size(), JSON));
-      return std::move(JSON);
-    }
+    // found a delimiter
+    if (LineRef.find_first_not_of('-') == llvm::StringRef::npos)
+      break;
+
   }
 
   if (In.bad()) {
     log("Input error while reading message!");
     return llvm::None;
   } else {
-    log("Input message terminated by EOF");
+    Out.mirrorInput(
+        llvm::formatv("Content-Length: {0}\r\n\r\n{1}", JSON.size(), JSON));
     return std::move(JSON);
   }
 }
 
 void clangd::runLanguageServerLoop(std::istream &In, JSONOutput &Out,
                                    JSONStreamStyle InputStyle,
                                    JSONRPCDispatcher &Dispatcher,
                                    bool &IsDone) {

clangd/delimited-input-comment-at-the-end.test

+# RUN: clangd -input-style=delimited -run-synchronously -input-mirror-file %t < %s
+# RUN: grep '{"jsonrpc":"2.0","id":3,"method":"exit"}' %t
+#
+# RUN: clangd -lit-test -input-mirror-file %t < %s
+# RUN: grep '{"jsonrpc":"2.0","id":3,"method":"exit"}' %t
+#
+{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{},"trace":"off"}}
+---
+{"jsonrpc":"2.0","id":3,"method":"shutdown"}
+---
+{"jsonrpc":"2.0","id":3,"method":"exit"}
+# comment at the end