This is an archive of the discontinued LLVM Phabricator instance.

Differential D45621

[clangd][tests] Fix delimiter handling
Needs ReviewPublic

Authored by jkorous-apple on Apr 13 2018, 6:17 AM.
This revision needs review, but there are no reviewers specified.

Details

Reviewers
None
Summary

Empty line shouldn't be considered a delimiter

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

Diff Detail

Revision Contents

PathSize
clangd/
2 lines
clangd/
13 lines

Diff 142393

JSONRPCDispatcher.cpp

Show First 20 Lines • Show All 272 Lines • ▼ Show 20 Linesstatic llvm::Optional<std::string> readDelimitedMessage(std::istream &In,
while (std::getline(In, Line)) { while (std::getline(In, Line)) {
Line.push_back('\n'); // getline() consumed the newline. Line.push_back('\n'); // getline() consumed the newline.
auto LineRef = llvm::StringRef(Line).trim(); auto LineRef = llvm::StringRef(Line).trim();
if (LineRef.startswith("#")) // comment if (LineRef.startswith("#")) // comment
continue; continue;
// found a delimiter // found a delimiter
if (LineRef.find_first_not_of('-') == llvm::StringRef::npos) if (LineRef.rtrim() == "---")
break; break;
JSON += Line; JSON += Line;
} }
if (In.bad()) { if (In.bad()) {
log("Input error while reading message!"); log("Input error while reading message!");
return llvm::None; return llvm::None;
Show All 33 Lines

clangd/spaces-in-delimited-input.test

  • This file was added.
# 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