From 8bd9cf07ffa541e369ac6c902d24e2117f6a5153 Mon Sep 17 00:00:00 2001
From: Ludovic Jozeau <federandink@gmail.com>
Date: Mon, 20 Jul 2020 12:45:51 +0200
Subject: [PATCH] clang format, indent pp directives

---
 .clang-format         |  1 +
 src/clang_tu.cc       |  2 +-
 src/indexer.cc        | 12 ++++-----
 src/pipeline.cc       |  2 +-
 src/platform_posix.cc | 58 +++++++++++++++++++++----------------------
 src/platform_win.cc   | 22 ++++++++--------
 src/project.cc        |  4 +--
 src/sema_manager.cc   |  4 +--
 src/test.cc           |  4 +--
 9 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/.clang-format b/.clang-format
index 9b3aa8b7..7ddc5e3a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1 +1,2 @@
 BasedOnStyle: LLVM
+IndentPPDirectives: AfterHash
diff --git a/src/clang_tu.cc b/src/clang_tu.cc
index c583f89f..929eff85 100644
--- a/src/clang_tu.cc
+++ b/src/clang_tu.cc
@@ -119,7 +119,7 @@ buildCompilerInvocation(const std::string &main, std::vector<const char *> args,
   const driver::JobList &jobs = comp->getJobs();
   bool offload_compilation = false;
   if (jobs.size() > 1) {
-    for (auto &a : comp->getActions()){
+    for (auto &a : comp->getActions()) {
       // On MacOSX real actions may end up being wrapped in BindArchAction
       if (isa<driver::BindArchAction>(a))
         a = *a->input_begin();
diff --git a/src/indexer.cc b/src/indexer.cc
index d24e11e7..6e2cd63d 100644
--- a/src/indexer.cc
+++ b/src/indexer.cc
@@ -687,7 +687,7 @@ public:
   IndexDataConsumer(IndexParam &param) : param(param) {}
   void initialize(ASTContext &ctx) override { this->ctx = param.ctx = &ctx; }
 #if LLVM_VERSION_MAJOR < 10 // llvmorg-10-init-12036-g3b9715cb219
-# define handleDeclOccurrence handleDeclOccurence
+#  define handleDeclOccurrence handleDeclOccurence
 #endif
   bool handleDeclOccurrence(const Decl *d, index::SymbolRoleSet roles,
                             ArrayRef<index::SymbolRelation> relations,
@@ -885,10 +885,10 @@ public:
                 Usr usr1 = getUsr(d1, &info1);
                 IndexType &type1 = db->toType(usr1);
                 SourceLocation sl1 = d1->getLocation();
-                type1.def.spell = {
-                    Use{{fromTokenRange(sm, lang, {sl1, sl1}), Role::Definition},
-                        lid},
-                    fromTokenRange(sm, lang, sr1)};
+                type1.def.spell = {Use{{fromTokenRange(sm, lang, {sl1, sl1}),
+                                        Role::Definition},
+                                       lid},
+                                   fromTokenRange(sm, lang, sr1)};
                 type1.def.detailed_name = intern(info1->short_name);
                 type1.def.short_name_size = int16_t(info1->short_name.size());
                 type1.def.kind = SymbolKind::TypeParameter;
@@ -1208,7 +1208,7 @@ class IndexDiags : public DiagnosticConsumer {
 public:
   llvm::SmallString<64> message;
   void HandleDiagnostic(DiagnosticsEngine::Level level,
-    const clang::Diagnostic &info) override {
+                        const clang::Diagnostic &info) override {
     DiagnosticConsumer::HandleDiagnostic(level, info);
     if (message.empty())
       info.FormatDiagnostic(message);
diff --git a/src/pipeline.cc b/src/pipeline.cc
index 6eb45481..6faf025a 100644
--- a/src/pipeline.cc
+++ b/src/pipeline.cc
@@ -27,7 +27,7 @@
 #include <shared_mutex>
 #include <thread>
 #ifndef _WIN32
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 using namespace llvm;
 namespace chrono = std::chrono;
diff --git a/src/platform_posix.cc b/src/platform_posix.cc
index 5a937c65..351784fc 100644
--- a/src/platform_posix.cc
+++ b/src/platform_posix.cc
@@ -2,38 +2,38 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #if defined(__unix__) || defined(__APPLE__)
-#include "platform.hh"
+#  include "platform.hh"
 
-#include "utils.hh"
+#  include "utils.hh"
 
-#include <assert.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#  include <assert.h>
+#  include <limits.h>
+#  include <stdio.h>
+#  include <stdlib.h>
+#  include <string.h>
+#  include <time.h>
 
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <signal.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
-#include <sys/types.h> // required for stat.h
-#include <sys/wait.h>
-#include <unistd.h>
-#ifdef __GLIBC__
-#include <malloc.h>
-#endif
+#  include <dirent.h>
+#  include <errno.h>
+#  include <fcntl.h>
+#  include <pthread.h>
+#  include <signal.h>
+#  include <sys/resource.h>
+#  include <sys/stat.h>
+#  include <sys/types.h> // required for stat.h
+#  include <sys/wait.h>
+#  include <unistd.h>
+#  ifdef __GLIBC__
+#    include <malloc.h>
+#  endif
 
-#include <llvm/ADT/SmallString.h>
-#include <llvm/Support/Path.h>
+#  include <llvm/ADT/SmallString.h>
+#  include <llvm/Support/Path.h>
 
-#include <atomic>
-#include <condition_variable>
-#include <mutex>
-#include <string>
+#  include <atomic>
+#  include <condition_variable>
+#  include <mutex>
+#  include <string>
 
 namespace ccls {
 namespace pipeline {
@@ -47,9 +47,9 @@ std::string normalizePath(llvm::StringRef path) {
 }
 
 void freeUnusedMemory() {
-#ifdef __GLIBC__
+#  ifdef __GLIBC__
   malloc_trim(4 * 1024 * 1024);
-#endif
+#  endif
 }
 
 void traceMe() {
diff --git a/src/platform_win.cc b/src/platform_win.cc
index 4cafb3d7..9c00df39 100644
--- a/src/platform_win.cc
+++ b/src/platform_win.cc
@@ -2,21 +2,21 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #if defined(_WIN32)
-#include "platform.hh"
+#  include "platform.hh"
 
-#include "utils.hh"
+#  include "utils.hh"
 
-#include <Windows.h>
-#include <direct.h>
-#include <fcntl.h>
-#include <io.h>
+#  include <Windows.h>
+#  include <direct.h>
+#  include <fcntl.h>
+#  include <io.h>
 
-#include <sys/stat.h>
-#include <sys/types.h>
+#  include <sys/stat.h>
+#  include <sys/types.h>
 
-#include <algorithm>
-#include <string>
-#include <thread>
+#  include <algorithm>
+#  include <string>
+#  include <thread>
 
 namespace ccls {
 std::string normalizePath(llvm::StringRef path) {
diff --git a/src/project.cc b/src/project.cc
index 58fa850d..6bdfaaf9 100644
--- a/src/project.cc
+++ b/src/project.cc
@@ -25,9 +25,9 @@
 #include <rapidjson/writer.h>
 
 #ifdef _WIN32
-#include <Windows.h>
+#  include <Windows.h>
 #else
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 
 #include <array>
diff --git a/src/sema_manager.cc b/src/sema_manager.cc
index 1002565b..6338f463 100644
--- a/src/sema_manager.cc
+++ b/src/sema_manager.cc
@@ -47,12 +47,12 @@ struct ProxyFileSystem : FileSystem {
   std::error_code setCurrentWorkingDirectory(const Twine &Path) override {
     return FS->setCurrentWorkingDirectory(Path);
   }
-#if LLVM_VERSION_MAJOR == 7
+#  if LLVM_VERSION_MAJOR == 7
   std::error_code getRealPath(const Twine &Path,
                               SmallVectorImpl<char> &Output) const override {
     return FS->getRealPath(Path, Output);
   }
-#endif
+#  endif
   FileSystem &getUnderlyingFS() { return *FS; }
   IntrusiveRefCntPtr<FileSystem> FS;
 };
diff --git a/src/test.cc b/src/test.cc
index d74d4496..bcca16d4 100644
--- a/src/test.cc
+++ b/src/test.cc
@@ -25,8 +25,8 @@
 
 // The 'diff' utility is available and we can use dprintf(3).
 #if _POSIX_C_SOURCE >= 200809L
-#include <sys/wait.h>
-#include <unistd.h>
+#  include <sys/wait.h>
+#  include <unistd.h>
 #endif
 
 using namespace llvm;