diff options
author | Eric Liu <ioeric@google.com> | 2017-12-14 21:22:03 +0000 |
---|---|---|
committer | Eric Liu <ioeric@google.com> | 2017-12-14 21:22:03 +0000 |
commit | 4657293c74b7b4f7f20caa09760ac3c600cb6a20 (patch) | |
tree | 080dc90e56effe9e2d6b6a6c8c5e0e20a07ef4ba | |
parent | ffd3d6489a842b5e2b5da6eed099b3c730ebb9ba (diff) |
[clangd] Put all #includes in one block in clangd source files. NFC
Clang-format categorizes and sorts #includes with style. It doesn't make sense
to manually managing #include blocks.
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@320743 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | clangd/ClangdLSPServer.cpp | 1 | ||||
-rw-r--r-- | clangd/ClangdServer.h | 10 | ||||
-rw-r--r-- | clangd/ClangdUnit.cpp | 2 | ||||
-rw-r--r-- | clangd/ClangdUnitStore.h | 3 | ||||
-rw-r--r-- | clangd/Compiler.cpp | 1 | ||||
-rw-r--r-- | clangd/Compiler.h | 1 | ||||
-rw-r--r-- | clangd/JSONExpr.cpp | 1 | ||||
-rw-r--r-- | clangd/JSONExpr.h | 3 | ||||
-rw-r--r-- | clangd/Protocol.cpp | 1 | ||||
-rw-r--r-- | clangd/Trace.cpp | 1 | ||||
-rw-r--r-- | clangd/index/Index.cpp | 3 | ||||
-rw-r--r-- | clangd/index/Index.h | 1 | ||||
-rw-r--r-- | clangd/index/SymbolCollector.cpp | 1 | ||||
-rw-r--r-- | clangd/index/SymbolCollector.h | 1 | ||||
-rw-r--r-- | clangd/index/SymbolYAML.cpp | 3 |
15 files changed, 10 insertions, 23 deletions
diff --git a/clangd/ClangdLSPServer.cpp b/clangd/ClangdLSPServer.cpp index a448f1a8..20dec42c 100644 --- a/clangd/ClangdLSPServer.cpp +++ b/clangd/ClangdLSPServer.cpp @@ -9,7 +9,6 @@ #include "ClangdLSPServer.h" #include "JSONRPCDispatcher.h" - #include "llvm/Support/FormatVariadic.h" using namespace clang::clangd; diff --git a/clangd/ClangdServer.h b/clangd/ClangdServer.h index fe7a686d..79dd8242 100644 --- a/clangd/ClangdServer.h +++ b/clangd/ClangdServer.h @@ -10,20 +10,18 @@ #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_CLANGDSERVER_H #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_CLANGDSERVER_H +#include "ClangdUnit.h" #include "ClangdUnitStore.h" +#include "CodeComplete.h" #include "DraftStore.h" +#include "Function.h" #include "GlobalCompilationDatabase.h" +#include "Protocol.h" #include "clang/Tooling/CompilationDatabase.h" #include "clang/Tooling/Core/Replacement.h" #include "llvm/ADT/IntrusiveRefCntPtr.h" #include "llvm/ADT/Optional.h" #include "llvm/ADT/StringRef.h" - -#include "ClangdUnit.h" -#include "CodeComplete.h" -#include "Function.h" -#include "Protocol.h" - #include <condition_variable> #include <functional> #include <mutex> diff --git a/clangd/ClangdUnit.cpp b/clangd/ClangdUnit.cpp index 5f181a0b..5f45b2f4 100644 --- a/clangd/ClangdUnit.cpp +++ b/clangd/ClangdUnit.cpp @@ -8,7 +8,6 @@ //===---------------------------------------------------------------------===// #include "ClangdUnit.h" - #include "Compiler.h" #include "Logger.h" #include "Trace.h" @@ -28,7 +27,6 @@ #include "llvm/ADT/SmallVector.h" #include "llvm/Support/CrashRecoveryContext.h" #include "llvm/Support/Format.h" - #include <algorithm> #include <chrono> diff --git a/clangd/ClangdUnitStore.h b/clangd/ClangdUnitStore.h index df01eef9..ab31cb94 100644 --- a/clangd/ClangdUnitStore.h +++ b/clangd/ClangdUnitStore.h @@ -10,13 +10,12 @@ #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_CLANGDUNITSTORE_H #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_CLANGDUNITSTORE_H -#include <mutex> - #include "ClangdUnit.h" #include "GlobalCompilationDatabase.h" #include "Logger.h" #include "Path.h" #include "clang/Tooling/CompilationDatabase.h" +#include <mutex> namespace clang { namespace clangd { diff --git a/clangd/Compiler.cpp b/clangd/Compiler.cpp index e176c9ab..b45fbb57 100644 --- a/clangd/Compiler.cpp +++ b/clangd/Compiler.cpp @@ -6,6 +6,7 @@ // License. See LICENSE.TXT for details. // //===---------------------------------------------------------------------===// + #include "Compiler.h" #include "clang/Basic/TargetInfo.h" #include "clang/Lex/PreprocessorOptions.h" diff --git a/clangd/Compiler.h b/clangd/Compiler.h index e812a895..97b683c9 100644 --- a/clangd/Compiler.h +++ b/clangd/Compiler.h @@ -14,6 +14,7 @@ //===---------------------------------------------------------------------===// #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_COMPILER_H #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_COMPILER_H + #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/CompilerInvocation.h" #include "clang/Frontend/PrecompiledPreamble.h" diff --git a/clangd/JSONExpr.cpp b/clangd/JSONExpr.cpp index 010fc0c4..a6e6a555 100644 --- a/clangd/JSONExpr.cpp +++ b/clangd/JSONExpr.cpp @@ -8,7 +8,6 @@ //===---------------------------------------------------------------------===// #include "JSONExpr.h" - #include "llvm/Support/Format.h" #include <cctype> diff --git a/clangd/JSONExpr.h b/clangd/JSONExpr.h index 8cbfb8bf..8841ff2b 100644 --- a/clangd/JSONExpr.h +++ b/clangd/JSONExpr.h @@ -12,13 +12,12 @@ #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_JSON_H #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_JSON_H -#include <map> - #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Error.h" #include "llvm/Support/FormatVariadic.h" #include "llvm/Support/raw_ostream.h" +#include <map> namespace clang { namespace clangd { diff --git a/clangd/Protocol.cpp b/clangd/Protocol.cpp index c2a4d27f..2b9bd8e0 100644 --- a/clangd/Protocol.cpp +++ b/clangd/Protocol.cpp @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "Protocol.h" - #include "clang/Basic/LLVM.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/Format.h" diff --git a/clangd/Trace.cpp b/clangd/Trace.cpp index ce9608cb..03b70b09 100644 --- a/clangd/Trace.cpp +++ b/clangd/Trace.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "Trace.h" - #include "llvm/ADT/DenseSet.h" #include "llvm/Support/Chrono.h" #include "llvm/Support/FormatProviders.h" diff --git a/clangd/index/Index.cpp b/clangd/index/Index.cpp index 806303cf..f609056f 100644 --- a/clangd/index/Index.cpp +++ b/clangd/index/Index.cpp @@ -8,9 +8,8 @@ //===----------------------------------------------------------------------===// #include "Index.h" - -#include "llvm/Support/SHA1.h" #include "llvm/ADT/StringExtras.h" +#include "llvm/Support/SHA1.h" namespace clang { namespace clangd { diff --git a/clangd/index/Index.h b/clangd/index/Index.h index d36f720e..886e880b 100644 --- a/clangd/index/Index.h +++ b/clangd/index/Index.h @@ -15,7 +15,6 @@ #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/Hashing.h" #include "llvm/ADT/StringExtras.h" - #include <array> #include <string> diff --git a/clangd/index/SymbolCollector.cpp b/clangd/index/SymbolCollector.cpp index c2ddecbf..5b364291 100644 --- a/clangd/index/SymbolCollector.cpp +++ b/clangd/index/SymbolCollector.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "SymbolCollector.h" - #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclCXX.h" diff --git a/clangd/index/SymbolCollector.h b/clangd/index/SymbolCollector.h index a964942a..dfd66b94 100644 --- a/clangd/index/SymbolCollector.h +++ b/clangd/index/SymbolCollector.h @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "Index.h" - #include "clang/Index/IndexDataConsumer.h" #include "clang/Index/IndexSymbol.h" diff --git a/clangd/index/SymbolYAML.cpp b/clangd/index/SymbolYAML.cpp index bcd29853..9d89cc9a 100644 --- a/clangd/index/SymbolYAML.cpp +++ b/clangd/index/SymbolYAML.cpp @@ -8,12 +8,11 @@ //===----------------------------------------------------------------------===// #include "SymbolYAML.h" - #include "Index.h" +#include "llvm/Support/Errc.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/YAMLTraits.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Support/Errc.h" LLVM_YAML_IS_DOCUMENT_LIST_VECTOR(clang::clangd::Symbol) |