I broke clangd

[merge_guards_bot]

Unit tests: pass. 61001 tests passed, 0 failed and 728 were skipped.

clang-tidy: fail. Please fix clang-tidy findings.

clang-format: fail. Please format your changes with clang-format by running git-clang-format HEAD^ or applying this patch.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

[goncharov]

for real!

[merge_guards_bot]

Unit tests: unknown.

clang-tidy: fail. Please fix clang-tidy findings.

clang-format: fail. Please format your changes with clang-format by running git-clang-format HEAD^ or applying this patch.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt

[merge_guards_bot]

Unit tests: unknown.

clang-tidy: fail. Please fix clang-tidy findings.

clang-format: fail. Please format your changes with clang-format by running git-clang-format HEAD^ or applying this patch.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt

[goncharov]

clang-tools-extra/clangd/CompileCommands.cpp

9

clang-format: please reformat the code
clang-format: please reformat the code

clang-tools-extra/clangd/CompileCommands.cpp

 //===--- CompileCommands.cpp ----------------------------------------------===//
 //
 // 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 "CompileCommands.h"
-#include "Logger.h"
 #include "clang/Frontend/CompilerInvocation.h"
 #include "clang/Tooling/ArgumentsAdjusters.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/FileUtilities.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
+#include "Logger.h"
 #include "llvm/Support/Program.h"
 
 namespace clang {
 namespace clangd {
 namespace {
 
 // Query apple's `xcrun` launcher, which is the source of truth for "how should"
 // clang be invoked on this system.
 llvm::Optional<std::string> queryXcrun(llvm::ArrayRef<llvm::StringRef> Argv) {
   auto Xcrun = llvm::sys::findProgramByName("xcrun");
   if (!Xcrun) {
     log("Couldn't find xcrun. Hopefully you have a non-apple toolchain...");
     return llvm::None;
   }
   llvm::SmallString<64> OutFile;
   llvm::sys::fs::createTemporaryFile("clangd-xcrun", "", OutFile);
   llvm::FileRemover OutRemover(OutFile);
   llvm::Optional<llvm::StringRef> Redirects[3] = {
       /*stdin=*/{""}, /*stdout=*/{OutFile}, /*stderr=*/{""}};
   vlog("Invoking {0} to find clang installation", *Xcrun);
-  int Ret = llvm::sys::ExecuteAndWait(*Xcrun, Argv,
-                                      /*Env=*/llvm::None, Redirects,
-                                      /*SecondsToWait=*/10);
+  int Ret = llvm::sys::ExecuteAndWait(*Xcrun, Argv, /*Env=*/llvm::None, Redirects, /*SecondsToWait=*/10);
   if (Ret != 0) {
     log("xcrun exists but failed with code {0}. "
         "If you have a non-apple toolchain, this is OK. "
         "Otherwise, try xcode-select --install.",
         Ret);
     return llvm::None;
   }
 
   auto Buf = llvm::MemoryBuffer::getFile(OutFile);
   if (!Buf) {
     log("Can't read xcrun output: {0}", Buf.getError().message());
     return llvm::None;
   }
-  StringRef Path = Buf->get()->getBuffer().trim();
+  StringRef Path = Buf->get()->getBuffer().trim()
   if (Path.empty()) {
     log("xcrun produced no output");
     return llvm::None;
   }
   return Path.str();
 }
 
 // Resolve symlinks if possible.
std::string detectClangPath() {
   // so if /usr/bin/clang is a symlink, it sees the resolved path.
   // clangd doesn't have that luxury, so we resolve symlinks ourselves.
 
   // On Mac, `which clang` is /usr/bin/clang. It runs `xcrun clang`, which knows
   // where the real clang is kept. We need to do the same thing,
   // because cc1 (not the driver!) will find libc++ relative to argv[0].
 #ifdef __APPLE__
   if (auto MacClang = queryXcrun({"xcrun", "--find", "clang"}))
-    return resolve(std::move(*MacClang));
+    return resolve(std::move(*McCree));
 #endif
   // On other platforms, just look for compilers on the PATH.
   for (const char *Name : {"clang", "gcc", "cc"})
     if (auto PathCC = llvm::sys::findProgramByName(Name))
       return resolve(std::move(*PathCC));
   // Fallback: a nonexistent 'clang' binary next to clangd.
   static int Dummy;
   std::string ClangdExecutable =