[clangd] Enforce trailing slash for remote index's project root

[hokein]

clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp

387

Instead of handling this in all callers, I think it might be better to move it to Marshaller and drop the ends-with-slash assertion there.

[kbobyrev]

Handle slash appending in Marshaller.

[kbobyrev]

Remove redundant .str() calls.

[kbobyrev]

Rebase.

clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp

 #include "index/Serialization.h"
 #include "index/dex/Dex.h"
 #include "index/remote/Client.h"
 #include "llvm/ADT/ScopeExit.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/LineEditor/LineEditor.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Path.h"
 #include "llvm/Support/Signals.h"
 
 namespace clang {
 namespace clangd {
 namespace {
 
 llvm::cl::opt<std::string> IndexLocation(
     llvm::cl::desc("<path to index file | remote:server.address>"),
int main(int argc, const char *argv[]) {
   llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
 
   bool RemoteMode = llvm::StringRef(IndexLocation).startswith("remote:");
   if (RemoteMode && ProjectRoot.empty()) {
     llvm::errs() << "--project-root is required in remote mode\n";
     return -1;
   }
 
+  if (!ProjectRoot.empty() &&
+      !llvm::StringRef(ProjectRoot).endswith(llvm::sys::path::get_separator()))
+    ProjectRoot += llvm::sys::path::get_separator();
+
   std::unique_ptr<SymbolIndex> Index;
   reportTime(RemoteMode ? "Remote index client creation" : "Dex build",
              [&]() { Index = openIndex(IndexLocation); });
 
   if (!Index) {
     llvm::errs() << "Failed to open the index.\n";
     return -1;
   }
 
   if (!ExecCommand.empty())
     return runCommand(ExecCommand, *Index) ? 0 : 1;
 
   llvm::LineEditor LE("dexp");
   while (llvm::Optional<std::string> Request = LE.readLine())
     runCommand(std::move(*Request), *Index);
 }

clang-tools-extra/clangd/index/remote/Client.cpp

 //===--- Client.cpp ----------------------------------------------*- C++-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include <grpc++/grpc++.h>
 
 #include "Client.h"
 #include "Index.grpc.pb.h"
 #include "index/Index.h"
 #include "index/Serialization.h"
 #include "marshalling/Marshalling.h"
 #include "support/Logger.h"
 #include "support/Trace.h"

 
 public:
   IndexClient(
       std::shared_ptr<grpc::Channel> Channel, llvm::StringRef ProjectRoot,
       std::chrono::milliseconds DeadlineTime = std::chrono::milliseconds(1000))
       : Stub(remote::SymbolIndex::NewStub(Channel)),
         ProtobufMarshaller(new Marshaller(/*RemoteIndexRoot=*/"",
                                           /*LocalIndexRoot=*/ProjectRoot)),
-        DeadlineWaitingTime(DeadlineTime) {}
+        DeadlineWaitingTime(DeadlineTime) {
+    assert(!ProjectRoot.empty());
+  }
 
   void lookup(const clangd::LookupRequest &Request,
               llvm::function_ref<void(const clangd::Symbol &)> Callback) const {
     streamRPC(Request, &remote::SymbolIndex::Stub::Lookup, Callback);
   }
 
   bool
   fuzzyFind(const clangd::FuzzyFindRequest &Request,

clang-tools-extra/clangd/tool/ClangdMain.cpp

)";
   }
 #if CLANGD_ENABLE_REMOTE
   if (RemoteIndexAddress.empty() != ProjectRoot.empty()) {
     llvm::errs() << "remote-index-address and project-path have to be "
                     "specified at the same time.";
     return 1;
   }
   if (!RemoteIndexAddress.empty()) {
+    if (!ProjectRoot.empty() &&
+        !llvm::StringRef(ProjectRoot)
+             .endswith(llvm::sys::path::get_separator()))
+      ProjectRoot += llvm::sys::path::get_separator();
     if (IndexFile.empty()) {
       log("Connecting to remote index at {0}", RemoteIndexAddress);
       StaticIdx = remote::getClient(RemoteIndexAddress, ProjectRoot);
       EnableBackgroundIndex = false;
     } else {
       elog("When enabling remote index, IndexFile should not be specified. "
            "Only one can be used at time. Remote index will ignored.");
     }