lspserver: rename JSONStreamStyle::Delimited → LitTest (#682)

Depeneds on: #679

Author: inclyc

nixd/lspserver/include/lspserver/Connection.h

@@ -14,7 +14,7 @@ enum class JSONStreamStyle {
   // LSP standard, for real lsp server
   Standard,
   // For testing.
-  Delimited
+  LitTest
 };
 
 /// Parsed & classfied messages are dispatched to this handler class
@@ -46,7 +46,7 @@ class InboundPort {
   llvm::Expected<llvm::json::Value> readStandardMessage(std::string &Buffer);
 
   /// Read one message, expecting the input to be one of our Markdown lit-tests.
-  llvm::Expected<llvm::json::Value> readDelimitedMessage(std::string &Buffer);
+  llvm::Expected<llvm::json::Value> readLitTestMessage(std::string &Buffer);
 
   /// \brief Notify the inbound port to close the connection
   void close() { Close = true; }

nixd/lspserver/src/Connection.cpp

@@ -243,7 +243,7 @@ InboundPort::readStandardMessage(std::string &Buffer) {
 }
 
 llvm::Expected<llvm::json::Value>
-InboundPort::readDelimitedMessage(std::string &Buffer) {
+InboundPort::readLitTestMessage(std::string &Buffer) {
   enum class State { Prose, JSONBlock, NixBlock };
   State State = State::Prose;
   Buffer.clear();
@@ -308,8 +308,8 @@ InboundPort::readMessage(std::string &Buffer) {
 
   case JSONStreamStyle::Standard:
     return readStandardMessage(Buffer);
-  case JSONStreamStyle::Delimited:
-    return readDelimitedMessage(Buffer);
+  case JSONStreamStyle::LitTest:
+    return readLitTestMessage(Buffer);
   }
   assert(false && "Invalid stream style");
   __builtin_unreachable();

nixd/tools/nixd-attrset-eval.cpp

@@ -23,9 +23,8 @@ opt<JSONStreamStyle> InputStyle{
     desc("Input JSON stream encoding"),
     values(
         clEnumValN(JSONStreamStyle::Standard, "standard", "usual LSP protocol"),
-        clEnumValN(JSONStreamStyle::Delimited, "delimited",
-                   "messages delimited by `// -----` lines, "
-                   "with // comment support")),
+        clEnumValN(JSONStreamStyle::LitTest, "lit-test",
+                   "Input format for lit-testing")),
     init(JSONStreamStyle::Standard),
     cat(Debug),
     Hidden,
@@ -64,7 +63,7 @@ int main(int Argc, const char *Argv[]) {
                           "NIXD_NIXPKGS_EVAL_FLAGS");
 
   if (LitTest) {
-    InputStyle = JSONStreamStyle::Delimited;
+    InputStyle = JSONStreamStyle::LitTest;
     LogLevel = Logger::Level::Verbose;
     PrettyPrint = true;
   }

nixd/tools/nixd.cpp

@@ -26,9 +26,8 @@ opt<JSONStreamStyle> InputStyle{
     desc("Input JSON stream encoding"),
     values(
         clEnumValN(JSONStreamStyle::Standard, "standard", "usual LSP protocol"),
-        clEnumValN(JSONStreamStyle::Delimited, "delimited",
-                   "messages delimited by `// -----` lines, "
-                   "with // comment support")),
+        clEnumValN(JSONStreamStyle::LitTest, "lit-test",
+                   "Input format for lit-testing")),
     init(JSONStreamStyle::Standard),
     cat(Debug),
     Hidden,
@@ -63,7 +62,7 @@ int main(int argc, char *argv[]) {
                           "NIXD_FLAGS");
 
   if (LitTest) {
-    InputStyle = JSONStreamStyle::Delimited;
+    InputStyle = JSONStreamStyle::LitTest;
     LogLevel = Logger::Level::Verbose;
     PrettyPrint = true;
   }