[mlir][NFC] Move the LSP agnostic files to a new lsp-server directory

This allows for sharing the implementation of key components across multiple
MLIR language servers. These will be used in a followup to help implement
a PDLL language server.

Differential Revision: https://reviews.llvm.org/D121540

Author: River707

mlir/lib/Tools/CMakeLists.txt

@@ -1,3 +1,4 @@
+add_subdirectory(lsp-server-support)
 add_subdirectory(mlir-lsp-server)
 add_subdirectory(mlir-opt)
 add_subdirectory(mlir-reduce)

mlir/lib/Tools/lsp-server-support/CMakeLists.txt

@@ -0,0 +1,11 @@
+add_mlir_library(MLIRLspServerSupportLib
+  Logging.cpp
+  Protocol.cpp
+  Transport.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Tools/lsp-server
+
+  LINK_LIBS PUBLIC
+  MLIRSupport
+  )

mlir/lib/Tools/mlir-lsp-server/lsp/Logging.cpp renamed to mlir/lib/Tools/lsp-server-support/Logging.cpp

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LIB_MLIR_TOOLS_MLIRLSPSERVER_LSP_LOGGING_H
-#define LIB_MLIR_TOOLS_MLIRLSPSERVER_LSP_LOGGING_H
+#ifndef LIB_MLIR_TOOLS_LSPSERVERSUPPORT_LOGGING_H
+#define LIB_MLIR_TOOLS_LSPSERVERSUPPORT_LOGGING_H
 
 #include "mlir/Support/LLVM.h"
 #include "llvm/Support/Debug.h"
@@ -30,13 +30,16 @@ class Logger {
 
   /// Initiate a log message at various severity levels. These should be called
   /// after a call to `initialize`.
-  template <typename... Ts> static void debug(const char *fmt, Ts &&... vals) {
+  template <typename... Ts>
+  static void debug(const char *fmt, Ts &&...vals) {
     log(Level::Debug, fmt, llvm::formatv(fmt, std::forward<Ts>(vals)...));
   }
-  template <typename... Ts> static void info(const char *fmt, Ts &&... vals) {
+  template <typename... Ts>
+  static void info(const char *fmt, Ts &&...vals) {
     log(Level::Info, fmt, llvm::formatv(fmt, std::forward<Ts>(vals)...));
   }
-  template <typename... Ts> static void error(const char *fmt, Ts &&... vals) {
+  template <typename... Ts>
+  static void error(const char *fmt, Ts &&...vals) {
     log(Level::Error, fmt, llvm::formatv(fmt, std::forward<Ts>(vals)...));
   }
 
@@ -59,4 +62,4 @@ class Logger {
 } // namespace lsp
 } // namespace mlir
 
-#endif // LIB_MLIR_TOOLS_MLIRLSPSERVER_LSP_LOGGING_H
+#endif // LIB_MLIR_TOOLS_LSPSERVERSUPPORT_LOGGING_H

mlir/lib/Tools/mlir-lsp-server/lsp/Logging.h renamed to mlir/lib/Tools/lsp-server-support/Logging.h

@@ -20,8 +20,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LIB_MLIR_TOOLS_MLIRLSPSERVER_LSP_PROTOCOL_H_
-#define LIB_MLIR_TOOLS_MLIRLSPSERVER_LSP_PROTOCOL_H_
+#ifndef LIB_MLIR_TOOLS_LSPSERVERSUPPORT_PROTOCOL_H_
+#define LIB_MLIR_TOOLS_LSPSERVERSUPPORT_PROTOCOL_H_
 
 #include "mlir/Support/LLVM.h"
 #include "llvm/ADT/Optional.h"
@@ -644,7 +644,8 @@ llvm::json::Value toJSON(const PublishDiagnosticsParams &params);
 } // namespace mlir
 
 namespace llvm {
-template <> struct format_provider<mlir::lsp::Position> {
+template <>
+struct format_provider<mlir::lsp::Position> {
   static void format(const mlir::lsp::Position &pos, raw_ostream &os,
                      StringRef style) {
     assert(style.empty() && "style modifiers for this type are not supported");

mlir/lib/Tools/mlir-lsp-server/lsp/Protocol.cpp renamed to mlir/lib/Tools/lsp-server-support/Protocol.cpp

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LIB_MLIR_TOOLS_MLIRLSPSERVER_LSP_TRANSPORT_H_
-#define LIB_MLIR_TOOLS_MLIRLSPSERVER_LSP_TRANSPORT_H_
+#ifndef LIB_MLIR_TOOLS_LSPSERVERSUPPORT_TRANSPORT_H_
+#define LIB_MLIR_TOOLS_LSPSERVERSUPPORT_TRANSPORT_H_
 
 #include "Logging.h"
 #include "Protocol.h"

mlir/lib/Tools/mlir-lsp-server/lsp/Protocol.h renamed to mlir/lib/Tools/lsp-server-support/Protocol.h

@@ -1,7 +1,4 @@
 add_mlir_library(MLIRLspServerLib
-  lsp/Logging.cpp
-  lsp/Protocol.cpp
-  lsp/Transport.cpp
   LSPServer.cpp
   MLIRServer.cpp
   MlirLspServerMain.cpp
@@ -11,5 +8,6 @@ add_mlir_library(MLIRLspServerLib
 
   LINK_LIBS PUBLIC
   MLIRIR
+  MLIRLspServerSupportLib
   MLIRParser
   )

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

@@ -7,10 +7,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "LSPServer.h"
+#include "../lsp-server-support/Logging.h"
+#include "../lsp-server-support/Protocol.h"
+#include "../lsp-server-support/Transport.h"
 #include "MLIRServer.h"
-#include "lsp/Logging.h"
-#include "lsp/Protocol.h"
-#include "lsp/Transport.h"
 #include "llvm/ADT/FunctionExtras.h"
 #include "llvm/ADT/StringMap.h"