[clangd] Address FIXME and fix comment

[omtcyfz]

Summary

• Address a FIXME by warning the user that both -run-synchronously and -j X are passed.
• Fix a comment to suppress clang-tidy warning by passing the correct argument name.

[ioeric]

Thanks for the cleanup Kirill :)

clangd/tool/ClangdMain.cpp

153 ↗

(On Diff #135597)

-j is non-zero by default, and we shouldn't show warning if users only specify -run-synchronously. We should only warn if user explicitly set worker count while also providing -run-synchronously.

[omtcyfz]

Addressed review comment by checking whether -j option was actually passed to clangd.

[omtcyfz]

clangd/tool/ClangdMain.cpp

153 ↗

(On Diff #135597)

Oh, you're correct, I should've been more careful. This should be fine now.

[ioeric]

Oops, just realized I forgot to push the "send" button!

clangd/tool/ClangdMain.cpp

153 ↗

(On Diff #135626)

nit: no need for braces around one liners.

To make this an real one line, maybe "Ignoring -j because -run-synchronously is set.\n"?

[omtcyfz]

Address Eric's nit: make warning message shorter so that it would fit into one line in order to omit braces for a single statement for compliance with the clang-tools-extra codestyle, as discussed with Alex a long while ago.

clang-tools-extra/trunk/clangd/Context.cpp

 //===--- Context.cpp -----------------------------------------*- C++-*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===---------------------------------------------------------------------===//
 
 #include "Context.h"
 #include <cassert>
 
 namespace clang {
 namespace clangd {
 
-Context Context::empty() { return Context(/*Data=*/nullptr); }
+Context Context::empty() { return Context(/*DataPtr=*/nullptr); }
 
 Context::Context(std::shared_ptr<const Data> DataPtr)
     : DataPtr(std::move(DataPtr)) {}
 
 Context Context::clone() const { return Context(DataPtr); }
 
 static Context &currentContext() {
   static thread_local auto C = Context::empty();

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

int main(int argc, char *argv[]) {
   }
 
   if (!RunSynchronously && WorkerThreadsCount == 0) {
     llvm::errs() << "A number of worker threads cannot be 0. Did you mean to "
                     "specify -run-synchronously?";
     return 1;
   }
 
-  // Ignore -j option if -run-synchonously is used.
-  // FIXME: a warning should be shown here.
-  if (RunSynchronously)
+  if (RunSynchronously) {
+    if (WorkerThreadsCount.getNumOccurrences())
+      llvm::errs() << "Ignoring -j because -run-synchronously is set.\n";
     WorkerThreadsCount = 0;
+  }
 
   // Validate command line arguments.
   llvm::Optional<llvm::raw_fd_ostream> InputMirrorStream;
   if (!InputMirrorFile.empty()) {
     std::error_code EC;
     InputMirrorStream.emplace(InputMirrorFile, /*ref*/ EC, llvm::sys::fs::F_RW);
     if (EC) {
       InputMirrorStream.reset();