[PATCH] D45764: [clangd][tests] Fix delimiter handling

[Jan Korous via Phabricator via cfe-commits]

jkorous created this revision.
jkorous added a project: clang-tools-extra.
Herald added subscribers: cfe-commits, MaskRay, ioeric, jkorous-apple, 
ilya-biryukov.

Empty line shouldn't be considered a delimiter.

Following https://reviews.llvm.org/D45763


Repository:
  rCTE Clang Tools Extra

https://reviews.llvm.org/D45764

Files:
  JSONRPCDispatcher.cpp
  clangd/spaces-in-delimited-input.test


Index: clangd/spaces-in-delimited-input.test
===================================================================
--- /dev/null
+++ clangd/spaces-in-delimited-input.test
@@ -0,0 +1,13 @@
+# RUN: clangd -input-style=delimited -run-synchronously < %s 2>&1 | FileCheck 
%s
+# RUN: clangd -lit-test -run-synchronously < %s 2>&1 | FileCheck %s
+#
+{"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"}
+# CHECK-NOT: JSON parse error
Index: JSONRPCDispatcher.cpp
===================================================================
--- JSONRPCDispatcher.cpp
+++ JSONRPCDispatcher.cpp
@@ -278,7 +278,7 @@
       continue;
 
     // found a delimiter
-    if (LineRef.find_first_not_of('-') == llvm::StringRef::npos)
+    if (LineRef.rtrim() == "---")
       break;
 
     JSON += Line;



Index: clangd/spaces-in-delimited-input.test
===================================================================
--- /dev/null
+++ clangd/spaces-in-delimited-input.test
@@ -0,0 +1,13 @@
+# RUN: clangd -input-style=delimited -run-synchronously < %s 2>&1 | FileCheck %s
+# RUN: clangd -lit-test -run-synchronously < %s 2>&1 | FileCheck %s
+#
+{"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"}
+# CHECK-NOT: JSON parse error
Index: JSONRPCDispatcher.cpp
===================================================================
--- JSONRPCDispatcher.cpp
+++ JSONRPCDispatcher.cpp
@@ -278,7 +278,7 @@
       continue;
 
     // found a delimiter
-    if (LineRef.find_first_not_of('-') == llvm::StringRef::npos)
+    if (LineRef.rtrim() == "---")
       break;
 
     JSON += Line;

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits