Addressed comments

Author: npanchen

mlir/include/mlir/Tools/lsp-server-support/Transport.h

@@ -50,11 +50,11 @@ class JSONTransportInput {
       : style(style) {}
   virtual ~JSONTransportInput() = default;
 
-  virtual bool getError() const = 0;
+  virtual bool hasError() const = 0;
   virtual bool isEndOfInput() const = 0;
 
   /// Read in a message from the input stream.
-  virtual LogicalResult readMessage(std::string &json) {
+  LogicalResult readMessage(std::string &json) {
     return style == JSONStreamStyle::Delimited ? readDelimitedMessage(json)
                                                : readStandardMessage(json);
   }
@@ -66,23 +66,14 @@ class JSONTransportInput {
   JSONStreamStyle style;
 };
 
-/// An abstract class used by the JSONTransport to write JSON messages.
-class JSONTransportOutput {
-public:
-  explicit JSONTransportOutput() = default;
-  virtual ~JSONTransportOutput() = default;
-
-  virtual void sendMessage(const llvm::json::Value &msg) = 0;
-};
-
 /// Concrete implementation of the JSONTransportInput that reads from a file.
 class JSONTransportInputOverFile : public JSONTransportInput {
 public:
   explicit JSONTransportInputOverFile(
       std::FILE *in, JSONStreamStyle style = JSONStreamStyle::Standard)
       : JSONTransportInput(style), in(in) {}
 
-  bool getError() const final { return ferror(in); }
+  bool hasError() const final { return ferror(in); }
   bool isEndOfInput() const final { return feof(in); }
 
   LogicalResult readDelimitedMessage(std::string &json) final;
@@ -92,37 +83,19 @@ class JSONTransportInputOverFile : public JSONTransportInput {
   std::FILE *in;
 };
 
-/// Concrete implementation of the JSONTransportOutput that writes to a stream.
-class JSONTransportOutputOverStream : public JSONTransportOutput {
-public:
-  explicit JSONTransportOutputOverStream(raw_ostream &out,
-                                         bool prettyOutput = false)
-      : JSONTransportOutput(), out(out), prettyOutput(prettyOutput) {}
-
-  /// Writes the given message to the output stream.
-  void sendMessage(const llvm::json::Value &msg) final;
-
-private:
-  SmallVector<char, 0> outputBuffer;
-  raw_ostream &out;
-  /// If the output JSON should be formatted for easier readability.
-  bool prettyOutput;
-};
-
 /// A transport class that performs the JSON-RPC communication with the LSP
 /// client.
 class JSONTransport {
 public:
-  JSONTransport(std::unique_ptr<JSONTransportInput> in,
-                std::unique_ptr<JSONTransportOutput> out)
-      : in(std::move(in)), out(std::move(out)) {}
+  JSONTransport(std::unique_ptr<JSONTransportInput> in, raw_ostream &out,
+                bool prettyOutput = false)
+      : in(std::move(in)), out(out), prettyOutput(prettyOutput) {}
 
   JSONTransport(std::FILE *in, raw_ostream &out,
                 JSONStreamStyle style = JSONStreamStyle::Standard,
                 bool prettyOutput = false)
-      : in(std::make_unique<JSONTransportInputOverFile>(in, style)),
-        out(std::make_unique<JSONTransportOutputOverStream>(out,
-                                                            prettyOutput)) {}
+      : in(std::make_unique<JSONTransportInputOverFile>(in, style)), out(out),
+        prettyOutput(prettyOutput) {}
 
   /// The following methods are used to send a message to the LSP client.
   void notify(StringRef method, llvm::json::Value params);
@@ -132,15 +105,20 @@ class JSONTransport {
   /// Start executing the JSON-RPC transport.
   llvm::Error run(MessageHandler &handler);
 
+private:
   /// Dispatches the given incoming json message to the message handler.
   bool handleMessage(llvm::json::Value msg, MessageHandler &handler);
+  /// Writes the given message to the output stream.
+  void sendMessage(llvm::json::Value msg);
 
 private:
   /// The input to read a message from.
   std::unique_ptr<JSONTransportInput> in;
-
-  /// The output to send a messages to.
-  std::unique_ptr<JSONTransportOutput> out;
+  SmallVector<char, 0> outputBuffer;
+  /// The output file stream.
+  raw_ostream &out;
+  /// If the output JSON should be formatted for easier readability.
+  bool prettyOutput;
 };
 
 //===----------------------------------------------------------------------===//

mlir/lib/Tools/lsp-server-support/Transport.cpp

@@ -175,15 +175,15 @@ llvm::Error decodeError(const llvm::json::Object &o) {
 }
 
 void JSONTransport::notify(StringRef method, llvm::json::Value params) {
-  out->sendMessage(llvm::json::Object{
+  sendMessage(llvm::json::Object{
       {"jsonrpc", "2.0"},
       {"method", method},
       {"params", std::move(params)},
   });
 }
 void JSONTransport::call(StringRef method, llvm::json::Value params,
                          llvm::json::Value id) {
-  out->sendMessage(llvm::json::Object{
+  sendMessage(llvm::json::Object{
       {"jsonrpc", "2.0"},
       {"id", std::move(id)},
       {"method", method},
@@ -193,14 +193,14 @@ void JSONTransport::call(StringRef method, llvm::json::Value params,
 void JSONTransport::reply(llvm::json::Value id,
                           llvm::Expected<llvm::json::Value> result) {
   if (result) {
-    return out->sendMessage(llvm::json::Object{
+    return sendMessage(llvm::json::Object{
         {"jsonrpc", "2.0"},
         {"id", std::move(id)},
         {"result", std::move(*result)},
     });
   }
 
-  out->sendMessage(llvm::json::Object{
+  sendMessage(llvm::json::Object{
       {"jsonrpc", "2.0"},
       {"id", std::move(id)},
       {"error", encodeError(result.takeError())},
@@ -210,7 +210,7 @@ void JSONTransport::reply(llvm::json::Value id,
 llvm::Error JSONTransport::run(MessageHandler &handler) {
   std::string json;
   while (!in->isEndOfInput()) {
-    if (in->getError()) {
+    if (in->hasError()) {
       return llvm::errorCodeToError(
           std::error_code(errno, std::system_category()));
     }
@@ -227,7 +227,7 @@ llvm::Error JSONTransport::run(MessageHandler &handler) {
   return llvm::errorCodeToError(std::make_error_code(std::errc::io_error));
 }
 
-void JSONTransportOutputOverStream::sendMessage(const llvm::json::Value &msg) {
+void JSONTransport::sendMessage(llvm::json::Value msg) {
   outputBuffer.clear();
   llvm::raw_svector_ostream os(outputBuffer);
   os << llvm::formatv(prettyOutput ? "{0:2}\n" : "{0}", msg);
@@ -310,7 +310,7 @@ JSONTransportInputOverFile::readStandardMessage(std::string &json) {
   unsigned long long contentLength = 0;
   llvm::SmallString<128> line;
   while (true) {
-    if (feof(in) || ferror(in) || failed(readLine(in, line)))
+    if (feof(in) || hasError() || failed(readLine(in, line)))
       return failure();
 
     // Content-Length is a mandatory header, and the only one we handle.