Author: ioeric Date: Thu Dec 14 13:22:03 2017 New Revision: 320743 URL: http://llvm.org/viewvc/llvm-project?rev=320743&view=rev Log: [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. Modified: clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp clang-tools-extra/trunk/clangd/ClangdServer.h clang-tools-extra/trunk/clangd/ClangdUnit.cpp clang-tools-extra/trunk/clangd/ClangdUnitStore.h clang-tools-extra/trunk/clangd/Compiler.cpp clang-tools-extra/trunk/clangd/Compiler.h clang-tools-extra/trunk/clangd/JSONExpr.cpp clang-tools-extra/trunk/clangd/JSONExpr.h clang-tools-extra/trunk/clangd/Protocol.cpp clang-tools-extra/trunk/clangd/Trace.cpp clang-tools-extra/trunk/clangd/index/Index.cpp clang-tools-extra/trunk/clangd/index/Index.h clang-tools-extra/trunk/clangd/index/SymbolCollector.cpp clang-tools-extra/trunk/clangd/index/SymbolCollector.h clang-tools-extra/trunk/clangd/index/SymbolYAML.cpp Modified: clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp (original) +++ clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp Thu Dec 14 13:22:03 2017 @@ -9,7 +9,6 @@ #include "ClangdLSPServer.h" #include "JSONRPCDispatcher.h" - #include "llvm/Support/FormatVariadic.h" using namespace clang::clangd; Modified: clang-tools-extra/trunk/clangd/ClangdServer.h URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/ClangdServer.h?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/ClangdServer.h (original) +++ clang-tools-extra/trunk/clangd/ClangdServer.h Thu Dec 14 13:22:03 2017 @@ -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> Modified: clang-tools-extra/trunk/clangd/ClangdUnit.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/ClangdUnit.cpp?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/ClangdUnit.cpp (original) +++ clang-tools-extra/trunk/clangd/ClangdUnit.cpp Thu Dec 14 13:22:03 2017 @@ -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> Modified: clang-tools-extra/trunk/clangd/ClangdUnitStore.h URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/ClangdUnitStore.h?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/ClangdUnitStore.h (original) +++ clang-tools-extra/trunk/clangd/ClangdUnitStore.h Thu Dec 14 13:22:03 2017 @@ -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 { Modified: clang-tools-extra/trunk/clangd/Compiler.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/Compiler.cpp?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/Compiler.cpp (original) +++ clang-tools-extra/trunk/clangd/Compiler.cpp Thu Dec 14 13:22:03 2017 @@ -6,6 +6,7 @@ // License. See LICENSE.TXT for details. // //===---------------------------------------------------------------------===// + #include "Compiler.h" #include "clang/Basic/TargetInfo.h" #include "clang/Lex/PreprocessorOptions.h" Modified: clang-tools-extra/trunk/clangd/Compiler.h URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/Compiler.h?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/Compiler.h (original) +++ clang-tools-extra/trunk/clangd/Compiler.h Thu Dec 14 13:22:03 2017 @@ -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" Modified: clang-tools-extra/trunk/clangd/JSONExpr.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/JSONExpr.cpp?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/JSONExpr.cpp (original) +++ clang-tools-extra/trunk/clangd/JSONExpr.cpp Thu Dec 14 13:22:03 2017 @@ -8,7 +8,6 @@ //===---------------------------------------------------------------------===// #include "JSONExpr.h" - #include "llvm/Support/Format.h" #include <cctype> Modified: clang-tools-extra/trunk/clangd/JSONExpr.h URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/JSONExpr.h?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/JSONExpr.h (original) +++ clang-tools-extra/trunk/clangd/JSONExpr.h Thu Dec 14 13:22:03 2017 @@ -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 { Modified: clang-tools-extra/trunk/clangd/Protocol.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/Protocol.cpp?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/Protocol.cpp (original) +++ clang-tools-extra/trunk/clangd/Protocol.cpp Thu Dec 14 13:22:03 2017 @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "Protocol.h" - #include "clang/Basic/LLVM.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/Format.h" Modified: clang-tools-extra/trunk/clangd/Trace.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/Trace.cpp?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/Trace.cpp (original) +++ clang-tools-extra/trunk/clangd/Trace.cpp Thu Dec 14 13:22:03 2017 @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "Trace.h" - #include "llvm/ADT/DenseSet.h" #include "llvm/Support/Chrono.h" #include "llvm/Support/FormatProviders.h" Modified: clang-tools-extra/trunk/clangd/index/Index.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/index/Index.cpp?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/index/Index.cpp (original) +++ clang-tools-extra/trunk/clangd/index/Index.cpp Thu Dec 14 13:22:03 2017 @@ -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 { Modified: clang-tools-extra/trunk/clangd/index/Index.h URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/index/Index.h?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/index/Index.h (original) +++ clang-tools-extra/trunk/clangd/index/Index.h Thu Dec 14 13:22:03 2017 @@ -15,7 +15,6 @@ #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/Hashing.h" #include "llvm/ADT/StringExtras.h" - #include <array> #include <string> Modified: clang-tools-extra/trunk/clangd/index/SymbolCollector.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/index/SymbolCollector.cpp?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/index/SymbolCollector.cpp (original) +++ clang-tools-extra/trunk/clangd/index/SymbolCollector.cpp Thu Dec 14 13:22:03 2017 @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "SymbolCollector.h" - #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclCXX.h" Modified: clang-tools-extra/trunk/clangd/index/SymbolCollector.h URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/index/SymbolCollector.h?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/index/SymbolCollector.h (original) +++ clang-tools-extra/trunk/clangd/index/SymbolCollector.h Thu Dec 14 13:22:03 2017 @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "Index.h" - #include "clang/Index/IndexDataConsumer.h" #include "clang/Index/IndexSymbol.h" Modified: clang-tools-extra/trunk/clangd/index/SymbolYAML.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/index/SymbolYAML.cpp?rev=320743&r1=320742&r2=320743&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/index/SymbolYAML.cpp (original) +++ clang-tools-extra/trunk/clangd/index/SymbolYAML.cpp Thu Dec 14 13:22:03 2017 @@ -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) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits