Author: Christian Kühnel Date: 2021-12-02T15:58:35Z New Revision: 5bd643d31d11e96bcae833025b241681370e527c
URL: https://github.com/llvm/llvm-project/commit/5bd643d31d11e96bcae833025b241681370e527c DIFF: https://github.com/llvm/llvm-project/commit/5bd643d31d11e96bcae833025b241681370e527c.diff LOG: [clangd] cleanup of header guard names Renaming header guards to match the LLVM convention. This patch was created by automatically applying the fixes from clang-tidy. I've removed the [NFC] tag from the title, as we're adding header guards in some files and thus might trigger behavior changes. Differential Revision: https://reviews.llvm.org/D113896 Added: Modified: clang-tools-extra/clangd/CollectMacros.h clang-tools-extra/clangd/ExpectedTypes.h clang-tools-extra/clangd/FindTarget.h clang-tools-extra/clangd/HeaderSourceSwitch.h clang-tools-extra/clangd/HeuristicResolver.h clang-tools-extra/clangd/IncludeCleaner.h clang-tools-extra/clangd/IncludeFixer.h clang-tools-extra/clangd/InlayHints.h clang-tools-extra/clangd/PathMapping.h clang-tools-extra/clangd/URI.h clang-tools-extra/clangd/index/BackgroundIndexLoader.h clang-tools-extra/clangd/index/BackgroundRebuild.h clang-tools-extra/clangd/index/CanonicalIncludes.h clang-tools-extra/clangd/index/IndexAction.h clang-tools-extra/clangd/index/ProjectAware.h clang-tools-extra/clangd/index/Serialization.h clang-tools-extra/clangd/index/SymbolCollector.h clang-tools-extra/clangd/index/SymbolLocation.h clang-tools-extra/clangd/index/SymbolOrigin.h clang-tools-extra/clangd/index/dex/Token.h clang-tools-extra/clangd/index/dex/Trigram.h clang-tools-extra/clangd/index/remote/Client.h clang-tools-extra/clangd/refactor/Tweak.h clang-tools-extra/clangd/unittests/Annotations.h clang-tools-extra/clangd/unittests/LSPClient.h clang-tools-extra/clangd/unittests/Matchers.h clang-tools-extra/clangd/unittests/SyncAPI.h clang-tools-extra/clangd/unittests/TestFS.h clang-tools-extra/clangd/unittests/TestIndex.h clang-tools-extra/clangd/unittests/TestTU.h clang-tools-extra/clangd/unittests/TestWorkspace.h clang-tools-extra/clangd/unittests/support/TestTracer.h clang-tools-extra/clangd/unittests/tweaks/TweakTesting.h Removed: clang-tools-extra/clangd/unittests/TestScheme.h ################################################################################ diff --git a/clang-tools-extra/clangd/CollectMacros.h b/clang-tools-extra/clangd/CollectMacros.h index 2167ebe2e3560..f8df9f9a20cc4 100644 --- a/clang-tools-extra/clangd/CollectMacros.h +++ b/clang-tools-extra/clangd/CollectMacros.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_COLLECTEDMACROS_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_COLLECTEDMACROS_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_COLLECTMACROS_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_COLLECTMACROS_H #include "AST.h" #include "Protocol.h" @@ -114,4 +114,4 @@ collectPragmaMarksCallback(const SourceManager &, std::vector<PragmaMark> &Out); } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_COLLECTEDMACROS_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_COLLECTMACROS_H diff --git a/clang-tools-extra/clangd/ExpectedTypes.h b/clang-tools-extra/clangd/ExpectedTypes.h index 36b7cce170234..873b106b91d17 100644 --- a/clang-tools-extra/clangd/ExpectedTypes.h +++ b/clang-tools-extra/clangd/ExpectedTypes.h @@ -15,8 +15,8 @@ // the index. Similar types (such as `int` and `long`) are folded together, // forming equivalence classes with the same encoding. //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_EXPECTED_TYPES_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_EXPECTED_TYPES_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_EXPECTEDTYPES_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_EXPECTEDTYPES_H #include "clang/AST/Type.h" #include "llvm/ADT/StringRef.h" diff --git a/clang-tools-extra/clangd/FindTarget.h b/clang-tools-extra/clangd/FindTarget.h index 3e4cf8b0c9a0a..756fe1d6458f9 100644 --- a/clang-tools-extra/clangd/FindTarget.h +++ b/clang-tools-extra/clangd/FindTarget.h @@ -19,8 +19,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_FINDTARGET_H -#define LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_FINDTARGET_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_FINDTARGET_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_FINDTARGET_H #include "clang/AST/ASTContext.h" #include "clang/AST/ASTTypeTraits.h" @@ -220,4 +220,4 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &, DeclRelationSet); } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_FINDTARGET_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_FINDTARGET_H diff --git a/clang-tools-extra/clangd/HeaderSourceSwitch.h b/clang-tools-extra/clangd/HeaderSourceSwitch.h index 8cdd3f0282809..092b41353aef3 100644 --- a/clang-tools-extra/clangd/HeaderSourceSwitch.h +++ b/clang-tools-extra/clangd/HeaderSourceSwitch.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_HEADERSOURCESWITCH_H -#define LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_HEADERSOURCESWITCH_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_HEADERSOURCESWITCH_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_HEADERSOURCESWITCH_H #include "ParsedAST.h" #include "llvm/ADT/Optional.h" @@ -33,4 +33,4 @@ std::vector<const Decl *> getIndexableLocalDecls(ParsedAST &AST); } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_HEADERSOURCESWITCH_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_HEADERSOURCESWITCH_H diff --git a/clang-tools-extra/clangd/HeuristicResolver.h b/clang-tools-extra/clangd/HeuristicResolver.h index c66e1d1895699..7f02636bfeed7 100644 --- a/clang-tools-extra/clangd/HeuristicResolver.h +++ b/clang-tools-extra/clangd/HeuristicResolver.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_HEURISTIC_RESOLVER_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_HEURISTIC_RESOLVER_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_HEURISTICRESOLVER_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_HEURISTICRESOLVER_H #include "clang/AST/Decl.h" #include "llvm/ADT/STLExtras.h" diff --git a/clang-tools-extra/clangd/IncludeCleaner.h b/clang-tools-extra/clangd/IncludeCleaner.h index 59756faea8e78..368cc70323278 100644 --- a/clang-tools-extra/clangd/IncludeCleaner.h +++ b/clang-tools-extra/clangd/IncludeCleaner.h @@ -18,8 +18,8 @@ /// //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INCLUDE_CLEANER_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INCLUDE_CLEANER_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INCLUDECLEANER_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INCLUDECLEANER_H #include "Headers.h" #include "ParsedAST.h" @@ -75,4 +75,4 @@ std::vector<Diag> issueUnusedIncludesDiagnostics(ParsedAST &AST, } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INCLUDE_CLEANER_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INCLUDECLEANER_H diff --git a/clang-tools-extra/clangd/IncludeFixer.h b/clang-tools-extra/clangd/IncludeFixer.h index ba2a59fb3fb53..b9128584eb43d 100644 --- a/clang-tools-extra/clangd/IncludeFixer.h +++ b/clang-tools-extra/clangd/IncludeFixer.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INCLUDE_FIXER_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INCLUDE_FIXER_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INCLUDEFIXER_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INCLUDEFIXER_H #include "Diagnostics.h" #include "Headers.h" @@ -95,4 +95,4 @@ class IncludeFixer { } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INCLUDE_FIXER_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INCLUDEFIXER_H diff --git a/clang-tools-extra/clangd/InlayHints.h b/clang-tools-extra/clangd/InlayHints.h index 7fff916a24c03..4157a45bd4379 100644 --- a/clang-tools-extra/clangd/InlayHints.h +++ b/clang-tools-extra/clangd/InlayHints.h @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INLAY_HINTS_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INLAY_HINTS_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INLAYHINTS_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INLAYHINTS_H #include "Protocol.h" #include <vector> @@ -28,4 +28,4 @@ std::vector<InlayHint> inlayHints(ParsedAST &AST); } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INLAY_HINTS_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INLAYHINTS_H diff --git a/clang-tools-extra/clangd/PathMapping.h b/clang-tools-extra/clangd/PathMapping.h index 1d98feb7287f5..58e42261732ed 100644 --- a/clang-tools-extra/clangd/PathMapping.h +++ b/clang-tools-extra/clangd/PathMapping.h @@ -5,6 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// + +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_PATHMAPPING_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_PATHMAPPING_H + #include "llvm/ADT/Optional.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Error.h" @@ -65,3 +69,5 @@ createPathMappingTransport(std::unique_ptr<Transport> Transp, } // namespace clangd } // namespace clang + +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_PATHMAPPING_H diff --git a/clang-tools-extra/clangd/URI.h b/clang-tools-extra/clangd/URI.h index 5f120ef9e386f..7f3bc9d1645a8 100644 --- a/clang-tools-extra/clangd/URI.h +++ b/clang-tools-extra/clangd/URI.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_PATHURI_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_PATHURI_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_URI_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_URI_H #include "llvm/ADT/StringRef.h" #include "llvm/Support/Error.h" @@ -133,4 +133,4 @@ typedef llvm::Registry<URIScheme> URISchemeRegistry; } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_PATHURI_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_URI_H diff --git a/clang-tools-extra/clangd/index/BackgroundIndexLoader.h b/clang-tools-extra/clangd/index/BackgroundIndexLoader.h index aa7ee39ef0bb5..919e2036f060c 100644 --- a/clang-tools-extra/clangd/index/BackgroundIndexLoader.h +++ b/clang-tools-extra/clangd/index/BackgroundIndexLoader.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_BACKGROUND_INDEX_LOADER_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_BACKGROUND_INDEX_LOADER_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_BACKGROUNDINDEXLOADER_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_BACKGROUNDINDEXLOADER_H #include "index/Background.h" #include "support/Path.h" diff --git a/clang-tools-extra/clangd/index/BackgroundRebuild.h b/clang-tools-extra/clangd/index/BackgroundRebuild.h index bc68536c847f8..fa41f5a313240 100644 --- a/clang-tools-extra/clangd/index/BackgroundRebuild.h +++ b/clang-tools-extra/clangd/index/BackgroundRebuild.h @@ -11,8 +11,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_BACKGROUND_INDEX_REBUILD_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_BACKGROUND_INDEX_REBUILD_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_BACKGROUNDREBUILD_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_BACKGROUNDREBUILD_H #include "index/FileIndex.h" #include "index/Index.h" diff --git a/clang-tools-extra/clangd/index/CanonicalIncludes.h b/clang-tools-extra/clangd/index/CanonicalIncludes.h index 36e33e9324dc7..7d19e542bedfe 100644 --- a/clang-tools-extra/clangd/index/CanonicalIncludes.h +++ b/clang-tools-extra/clangd/index/CanonicalIncludes.h @@ -92,4 +92,4 @@ collectIWYUHeaderMaps(CanonicalIncludes *Includes); } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_HEADERMAPCOLLECTOR_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_CANONICALINCLUDES_H diff --git a/clang-tools-extra/clangd/index/IndexAction.h b/clang-tools-extra/clangd/index/IndexAction.h index ab9a1e826a279..ac8e1430841ac 100644 --- a/clang-tools-extra/clangd/index/IndexAction.h +++ b/clang-tools-extra/clangd/index/IndexAction.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_INDEX_ACTION_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_INDEX_ACTION_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_INDEXACTION_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_INDEXACTION_H #include "Headers.h" #include "SymbolCollector.h" #include "clang/Frontend/FrontendActions.h" diff --git a/clang-tools-extra/clangd/index/ProjectAware.h b/clang-tools-extra/clangd/index/ProjectAware.h index c05f3d307c419..1f7ae8f03f21b 100644 --- a/clang-tools-extra/clangd/index/ProjectAware.h +++ b/clang-tools-extra/clangd/index/ProjectAware.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_PROJECT_AWARE_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_PROJECT_AWARE_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_PROJECTAWARE_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_PROJECTAWARE_H #include "Config.h" #include "index/Index.h" diff --git a/clang-tools-extra/clangd/index/Serialization.h b/clang-tools-extra/clangd/index/Serialization.h index 99510630f1cac..936939e4abc6a 100644 --- a/clang-tools-extra/clangd/index/Serialization.h +++ b/clang-tools-extra/clangd/index/Serialization.h @@ -21,8 +21,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_RIFF_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_RIFF_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SERIALIZATION_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SERIALIZATION_H #include "Headers.h" #include "Index.h" diff --git a/clang-tools-extra/clangd/index/SymbolCollector.h b/clang-tools-extra/clangd/index/SymbolCollector.h index af184fde69c60..be5fb4b84871c 100644 --- a/clang-tools-extra/clangd/index/SymbolCollector.h +++ b/clang-tools-extra/clangd/index/SymbolCollector.h @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOL_COLLECTOR_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOL_COLLECTOR_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOLCOLLECTOR_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOLCOLLECTOR_H #include "CanonicalIncludes.h" #include "CollectMacros.h" diff --git a/clang-tools-extra/clangd/index/SymbolLocation.h b/clang-tools-extra/clangd/index/SymbolLocation.h index 2dd33839115e6..eadf211bb3bf6 100644 --- a/clang-tools-extra/clangd/index/SymbolLocation.h +++ b/clang-tools-extra/clangd/index/SymbolLocation.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOL_LOCATION_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOL_LOCATION_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOLLOCATION_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOLLOCATION_H #include "llvm/ADT/StringRef.h" #include "llvm/Support/raw_ostream.h" @@ -92,4 +92,4 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &, const SymbolLocation &); } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOL_LOCATION_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOLLOCATION_H diff --git a/clang-tools-extra/clangd/index/SymbolOrigin.h b/clang-tools-extra/clangd/index/SymbolOrigin.h index dd3a83230b0e0..0ed81c6a3e28d 100644 --- a/clang-tools-extra/clangd/index/SymbolOrigin.h +++ b/clang-tools-extra/clangd/index/SymbolOrigin.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOL_ORIGIN_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOL_ORIGIN_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOLORIGIN_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOLORIGIN_H #include "llvm/Support/raw_ostream.h" #include <cstdint> @@ -46,4 +46,4 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &, SymbolOrigin); } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOL_ORIGIN_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOLORIGIN_H diff --git a/clang-tools-extra/clangd/index/dex/Token.h b/clang-tools-extra/clangd/index/dex/Token.h index 447aee2275860..db367c06ccb1f 100644 --- a/clang-tools-extra/clangd/index/dex/Token.h +++ b/clang-tools-extra/clangd/index/dex/Token.h @@ -19,8 +19,8 @@ /// //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_DEX_TOKEN_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_DEX_TOKEN_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_DEX_TOKEN_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_DEX_TOKEN_H #include "index/Index.h" #include "llvm/ADT/DenseMap.h" @@ -136,4 +136,4 @@ template <> struct DenseMapInfo<clang::clangd::dex::Token> { } // namespace llvm -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_DEX_TOKEN_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_DEX_TOKEN_H diff --git a/clang-tools-extra/clangd/index/dex/Trigram.h b/clang-tools-extra/clangd/index/dex/Trigram.h index 2abb01006fd31..055116870f440 100644 --- a/clang-tools-extra/clangd/index/dex/Trigram.h +++ b/clang-tools-extra/clangd/index/dex/Trigram.h @@ -20,8 +20,8 @@ /// //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_DEX_TRIGRAM_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_DEX_TRIGRAM_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_DEX_TRIGRAM_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_DEX_TRIGRAM_H #include "Token.h" #include "llvm/ADT/bit.h" @@ -111,4 +111,4 @@ template <> struct DenseMapInfo<clang::clangd::dex::Trigram> { }; } // namespace llvm -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_DEX_TRIGRAM_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_DEX_TRIGRAM_H diff --git a/clang-tools-extra/clangd/index/remote/Client.h b/clang-tools-extra/clangd/index/remote/Client.h index 7b4173af6cfad..ff5348bd23279 100644 --- a/clang-tools-extra/clangd/index/remote/Client.h +++ b/clang-tools-extra/clangd/index/remote/Client.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_REMOTE_INDEX_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_REMOTE_INDEX_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_REMOTE_CLIENT_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_REMOTE_CLIENT_H #include "index/Index.h" #include "llvm/ADT/StringRef.h" @@ -33,4 +33,4 @@ std::unique_ptr<clangd::SymbolIndex> getClient(llvm::StringRef Address, } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_REMOTE_INDEX_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_REMOTE_CLIENT_H diff --git a/clang-tools-extra/clangd/refactor/Tweak.h b/clang-tools-extra/clangd/refactor/Tweak.h index 5b2d9cc80d9fd..84fbada46014d 100644 --- a/clang-tools-extra/clangd/refactor/Tweak.h +++ b/clang-tools-extra/clangd/refactor/Tweak.h @@ -16,8 +16,8 @@ // It is performed when the user actually chooses the action. //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_REFACTOR_ACTIONS_TWEAK_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_REFACTOR_ACTIONS_TWEAK_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_REFACTOR_TWEAK_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_REFACTOR_TWEAK_H #include "ParsedAST.h" #include "Protocol.h" diff --git a/clang-tools-extra/clangd/unittests/Annotations.h b/clang-tools-extra/clangd/unittests/Annotations.h index 846c36a5b42b7..9c296810e44dd 100644 --- a/clang-tools-extra/clangd/unittests/Annotations.h +++ b/clang-tools-extra/clangd/unittests/Annotations.h @@ -9,8 +9,8 @@ // offsets and offset-based ranges with types from the LSP protocol. //===---------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_ANNOTATIONS_H -#define LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_ANNOTATIONS_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_ANNOTATIONS_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_ANNOTATIONS_H #include "Protocol.h" #include "llvm/Testing/Support/Annotations.h" @@ -36,4 +36,4 @@ class Annotations : public llvm::Annotations { } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_ANNOTATIONS_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_ANNOTATIONS_H diff --git a/clang-tools-extra/clangd/unittests/LSPClient.h b/clang-tools-extra/clangd/unittests/LSPClient.h index b505c4f13ea24..307946ba1ed9e 100644 --- a/clang-tools-extra/clangd/unittests/LSPClient.h +++ b/clang-tools-extra/clangd/unittests/LSPClient.h @@ -6,6 +6,9 @@ // //===----------------------------------------------------------------------===// +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_LSPCLIENT_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_LSPCLIENT_H + #include <condition_variable> #include <deque> #include <llvm/ADT/Optional.h> @@ -80,3 +83,5 @@ class LSPClient { } // namespace clangd } // namespace clang + +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_LSPCLIENT_H diff --git a/clang-tools-extra/clangd/unittests/Matchers.h b/clang-tools-extra/clangd/unittests/Matchers.h index 2bd915d83a7a1..ef53e867949c9 100644 --- a/clang-tools-extra/clangd/unittests/Matchers.h +++ b/clang-tools-extra/clangd/unittests/Matchers.h @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_MATCHERS_H -#define LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_MATCHERS_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_MATCHERS_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_MATCHERS_H #include "Protocol.h" #include "gmock/gmock.h" diff --git a/clang-tools-extra/clangd/unittests/SyncAPI.h b/clang-tools-extra/clangd/unittests/SyncAPI.h index 71fdf33ce720a..41926bf66bd8b 100644 --- a/clang-tools-extra/clangd/unittests/SyncAPI.h +++ b/clang-tools-extra/clangd/unittests/SyncAPI.h @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_SYNCAPI_H -#define LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_SYNCAPI_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_SYNCAPI_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_SYNCAPI_H #include "ClangdServer.h" #include "index/Index.h" @@ -69,4 +69,4 @@ llvm::Error runCustomAction(ClangdServer &Server, PathRef File, } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_SYNCAPI_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_SYNCAPI_H diff --git a/clang-tools-extra/clangd/unittests/TestFS.h b/clang-tools-extra/clangd/unittests/TestFS.h index 82de319d96cf8..8a0ea59f6a032 100644 --- a/clang-tools-extra/clangd/unittests/TestFS.h +++ b/clang-tools-extra/clangd/unittests/TestFS.h @@ -9,8 +9,8 @@ // Allows setting up fake filesystem environments for tests. // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_TESTFS_H -#define LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_TESTFS_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_TESTFS_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_TESTFS_H #include "ClangdServer.h" #include "GlobalCompilationDatabase.h" #include "support/Path.h" diff --git a/clang-tools-extra/clangd/unittests/TestIndex.h b/clang-tools-extra/clangd/unittests/TestIndex.h index 01de089eabff5..f83e16e5314fa 100644 --- a/clang-tools-extra/clangd/unittests/TestIndex.h +++ b/clang-tools-extra/clangd/unittests/TestIndex.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_INDEXTESTCOMMON_H -#define LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_INDEXTESTCOMMON_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_TESTINDEX_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_TESTINDEX_H #include "index/Index.h" #include "index/Merge.h" diff --git a/clang-tools-extra/clangd/unittests/TestScheme.h b/clang-tools-extra/clangd/unittests/TestScheme.h deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/clang-tools-extra/clangd/unittests/TestTU.h b/clang-tools-extra/clangd/unittests/TestTU.h index 2542e8fe654b7..9fc776ced4e0b 100644 --- a/clang-tools-extra/clangd/unittests/TestTU.h +++ b/clang-tools-extra/clangd/unittests/TestTU.h @@ -14,8 +14,8 @@ // //===---------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_TESTTU_H -#define LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_TESTTU_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_TESTTU_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_TESTTU_H #include "../TidyProvider.h" #include "Compiler.h" @@ -104,4 +104,4 @@ const NamedDecl &findUnqualifiedDecl(ParsedAST &AST, llvm::StringRef Name); } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_TESTTU_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_TESTTU_H diff --git a/clang-tools-extra/clangd/unittests/TestWorkspace.h b/clang-tools-extra/clangd/unittests/TestWorkspace.h index eb5112f198dd7..22d378bf9d026 100644 --- a/clang-tools-extra/clangd/unittests/TestWorkspace.h +++ b/clang-tools-extra/clangd/unittests/TestWorkspace.h @@ -13,8 +13,8 @@ // //===---------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_TESTWORKSPACE_H -#define LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_TESTWORKSPACE_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_TESTWORKSPACE_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_TESTWORKSPACE_H #include "TestFS.h" #include "TestTU.h" @@ -56,4 +56,4 @@ class TestWorkspace { } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_TESTWORKSPACE_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_TESTWORKSPACE_H diff --git a/clang-tools-extra/clangd/unittests/support/TestTracer.h b/clang-tools-extra/clangd/unittests/support/TestTracer.h index 24a7283a7ffc7..340d3a42958b0 100644 --- a/clang-tools-extra/clangd/unittests/support/TestTracer.h +++ b/clang-tools-extra/clangd/unittests/support/TestTracer.h @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_SUPPORT_TESTTRACER_H -#define LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_SUPPORT_TESTTRACER_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_SUPPORT_TESTTRACER_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_SUPPORT_TESTTRACER_H #include "support/Trace.h" #include "llvm/ADT/StringMap.h" diff --git a/clang-tools-extra/clangd/unittests/tweaks/TweakTesting.h b/clang-tools-extra/clangd/unittests/tweaks/TweakTesting.h index 7b1a117130bad..f87b1fd7f19f6 100644 --- a/clang-tools-extra/clangd/unittests/tweaks/TweakTesting.h +++ b/clang-tools-extra/clangd/unittests/tweaks/TweakTesting.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_TWEAKTESTING_H -#define LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_TWEAKTESTING_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_TWEAKS_TWEAKTESTING_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_UNITTESTS_TWEAKS_TWEAKTESTING_H #include "TestTU.h" #include "index/Index.h" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
