From 43356f56bd2ede05c70db537e3f8b50a31444487 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Mon, 25 Mar 2019 14:09:10 +0000 Subject: [PATCH] Rename directory housing clang-include-fixer to be eponymous Makes the name of this directory consistent with the names of the other directories in clang-tools-extra. Similar to r356254. No intended behavior change. Differential Revision: https://reviews.llvm.org/D59750 llvm-svn: 356897 --- clang-tools-extra/CMakeLists.txt | 4 ++-- .../CMakeLists.txt | 0 .../FuzzySymbolIndex.cpp | 0 .../FuzzySymbolIndex.h | 2 +- .../InMemorySymbolIndex.cpp | 0 .../InMemorySymbolIndex.h | 0 .../IncludeFixer.cpp | 6 +++--- .../IncludeFixer.h | 2 +- .../IncludeFixerContext.cpp | 0 .../IncludeFixerContext.h | 0 .../SymbolIndex.h | 0 .../SymbolIndexManager.cpp | 2 +- .../SymbolIndexManager.h | 0 .../YamlSymbolIndex.cpp | 0 .../YamlSymbolIndex.h | 0 .../find-all-symbols/CMakeLists.txt | 0 .../find-all-symbols/FindAllMacros.cpp | 0 .../find-all-symbols/FindAllMacros.h | 0 .../find-all-symbols/FindAllSymbols.cpp | 0 .../find-all-symbols/FindAllSymbols.h | 0 .../find-all-symbols/FindAllSymbolsAction.cpp | 0 .../find-all-symbols/FindAllSymbolsAction.h | 0 .../find-all-symbols/HeaderMapCollector.cpp | 0 .../find-all-symbols/HeaderMapCollector.h | 0 .../find-all-symbols/PathConfig.cpp | 0 .../find-all-symbols/PathConfig.h | 0 .../find-all-symbols/PragmaCommentHandler.cpp | 0 .../find-all-symbols/PragmaCommentHandler.h | 0 .../find-all-symbols/STLPostfixHeaderMap.cpp | 0 .../find-all-symbols/STLPostfixHeaderMap.h | 0 .../find-all-symbols/SymbolInfo.cpp | 0 .../find-all-symbols/SymbolInfo.h | 0 .../find-all-symbols/SymbolReporter.h | 0 .../find-all-symbols/tool/CMakeLists.txt | 0 .../tool/FindAllSymbolsMain.cpp | 0 .../tool/run-find-all-symbols.py | 0 .../plugin/CMakeLists.txt | 0 .../plugin/IncludeFixerPlugin.cpp | 0 .../tool/CMakeLists.txt | 0 .../tool/ClangIncludeFixer.cpp | 11 ++++++----- .../tool/clang-include-fixer-test.el | 0 .../tool/clang-include-fixer.el | 6 +++--- .../tool/clang-include-fixer.py | 14 ++++++++------ clang-tools-extra/clang-move/Move.cpp | 2 +- clang-tools-extra/clang-tidy/add_new_check.py | 2 +- clang-tools-extra/docs/ReleaseNotes.rst | 2 +- ...lude-fixer.rst => clang-include-fixer.rst} | 6 +++--- clang-tools-extra/docs/doxygen.cfg.in | 2 +- clang-tools-extra/docs/index.rst | 2 +- .../Inputs/database_template.json | 0 .../Inputs/fake_yaml_db.yaml | 2 +- .../Inputs/merge/a.yaml | 0 .../Inputs/merge/b.yaml | 0 .../commandline_options.cpp | 0 .../exit_on_fatal.cpp | 0 .../fixeddb.cpp | 0 .../test/clang-include-fixer/include_path.cpp | 19 +++++++++++++++++++ .../merge.test | 0 .../clang-include-fixer/multiple_fixes.cpp | 13 +++++++++++++ .../prefix_variable.cpp | 0 .../query_symbol.cpp | 0 .../ranking.cpp | 2 +- .../yaml_fuzzy.cpp | 2 +- .../yamldb.cpp | 0 .../yamldb_autodetect.cpp | 0 .../test/include-fixer/include_path.cpp | 19 ------------------- .../test/include-fixer/multiple_fixes.cpp | 13 ------------- clang-tools-extra/unittests/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../FuzzySymbolIndexTests.cpp | 0 .../IncludeFixerTest.cpp | 4 ++-- .../find-all-symbols/CMakeLists.txt | 2 +- .../find-all-symbols/FindAllSymbolsTests.cpp | 0 73 files changed, 73 insertions(+), 70 deletions(-) rename clang-tools-extra/{include-fixer => clang-include-fixer}/CMakeLists.txt (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/FuzzySymbolIndex.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/FuzzySymbolIndex.h (95%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/InMemorySymbolIndex.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/InMemorySymbolIndex.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/IncludeFixer.cpp (98%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/IncludeFixer.h (99%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/IncludeFixerContext.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/IncludeFixerContext.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/SymbolIndex.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/SymbolIndexManager.cpp (99%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/SymbolIndexManager.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/YamlSymbolIndex.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/YamlSymbolIndex.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/CMakeLists.txt (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/FindAllMacros.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/FindAllMacros.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/FindAllSymbols.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/FindAllSymbols.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/FindAllSymbolsAction.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/FindAllSymbolsAction.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/HeaderMapCollector.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/HeaderMapCollector.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/PathConfig.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/PathConfig.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/PragmaCommentHandler.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/PragmaCommentHandler.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/STLPostfixHeaderMap.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/STLPostfixHeaderMap.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/SymbolInfo.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/SymbolInfo.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/SymbolReporter.h (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/tool/CMakeLists.txt (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/tool/FindAllSymbolsMain.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/find-all-symbols/tool/run-find-all-symbols.py (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/plugin/CMakeLists.txt (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/plugin/IncludeFixerPlugin.cpp (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/tool/CMakeLists.txt (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/tool/ClangIncludeFixer.cpp (97%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/tool/clang-include-fixer-test.el (100%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/tool/clang-include-fixer.el (99%) rename clang-tools-extra/{include-fixer => clang-include-fixer}/tool/clang-include-fixer.py (95%) rename clang-tools-extra/docs/{include-fixer.rst => clang-include-fixer.rst} (96%) rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/Inputs/database_template.json (100%) rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/Inputs/fake_yaml_db.yaml (96%) rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/Inputs/merge/a.yaml (100%) rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/Inputs/merge/b.yaml (100%) rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/commandline_options.cpp (100%) rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/exit_on_fatal.cpp (100%) rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/fixeddb.cpp (100%) create mode 100644 clang-tools-extra/test/clang-include-fixer/include_path.cpp rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/merge.test (100%) create mode 100644 clang-tools-extra/test/clang-include-fixer/multiple_fixes.cpp rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/prefix_variable.cpp (100%) rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/query_symbol.cpp (100%) rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/ranking.cpp (89%) rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/yaml_fuzzy.cpp (74%) rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/yamldb.cpp (100%) rename clang-tools-extra/test/{include-fixer => clang-include-fixer}/yamldb_autodetect.cpp (100%) delete mode 100644 clang-tools-extra/test/include-fixer/include_path.cpp delete mode 100644 clang-tools-extra/test/include-fixer/multiple_fixes.cpp rename clang-tools-extra/unittests/{include-fixer => clang-include-fixer}/CMakeLists.txt (89%) rename clang-tools-extra/unittests/{include-fixer => clang-include-fixer}/FuzzySymbolIndexTests.cpp (100%) rename clang-tools-extra/unittests/{include-fixer => clang-include-fixer}/IncludeFixerTest.cpp (99%) rename clang-tools-extra/unittests/{include-fixer => clang-include-fixer}/find-all-symbols/CMakeLists.txt (82%) rename clang-tools-extra/unittests/{include-fixer => clang-include-fixer}/find-all-symbols/FindAllSymbolsTests.cpp (100%) diff --git a/clang-tools-extra/CMakeLists.txt b/clang-tools-extra/CMakeLists.txt index bb4533309bd0..66ebeaeeaa32 100644 --- a/clang-tools-extra/CMakeLists.txt +++ b/clang-tools-extra/CMakeLists.txt @@ -11,10 +11,10 @@ add_subdirectory(clang-tidy-vs) add_subdirectory(clang-change-namespace) add_subdirectory(clang-doc) -add_subdirectory(clang-query) +add_subdirectory(clang-include-fixer) add_subdirectory(clang-move) +add_subdirectory(clang-query) add_subdirectory(clangd) -add_subdirectory(include-fixer) add_subdirectory(pp-trace) add_subdirectory(tool-template) diff --git a/clang-tools-extra/include-fixer/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/CMakeLists.txt similarity index 100% rename from clang-tools-extra/include-fixer/CMakeLists.txt rename to clang-tools-extra/clang-include-fixer/CMakeLists.txt diff --git a/clang-tools-extra/include-fixer/FuzzySymbolIndex.cpp b/clang-tools-extra/clang-include-fixer/FuzzySymbolIndex.cpp similarity index 100% rename from clang-tools-extra/include-fixer/FuzzySymbolIndex.cpp rename to clang-tools-extra/clang-include-fixer/FuzzySymbolIndex.cpp diff --git a/clang-tools-extra/include-fixer/FuzzySymbolIndex.h b/clang-tools-extra/clang-include-fixer/FuzzySymbolIndex.h similarity index 95% rename from clang-tools-extra/include-fixer/FuzzySymbolIndex.h rename to clang-tools-extra/clang-include-fixer/FuzzySymbolIndex.h index 2ea166093647..27bfadf12a1f 100644 --- a/clang-tools-extra/include-fixer/FuzzySymbolIndex.h +++ b/clang-tools-extra/clang-include-fixer/FuzzySymbolIndex.h @@ -31,7 +31,7 @@ namespace include_fixer { // Implementations may choose to truncate results, refuse short queries, etc. class FuzzySymbolIndex : public SymbolIndex { public: - // Loads the specified include-fixer database and returns an index serving it. + // Loads the specified clang-include-fixer database and returns an index serving it. static llvm::Expected> createFromYAML(llvm::StringRef File); diff --git a/clang-tools-extra/include-fixer/InMemorySymbolIndex.cpp b/clang-tools-extra/clang-include-fixer/InMemorySymbolIndex.cpp similarity index 100% rename from clang-tools-extra/include-fixer/InMemorySymbolIndex.cpp rename to clang-tools-extra/clang-include-fixer/InMemorySymbolIndex.cpp diff --git a/clang-tools-extra/include-fixer/InMemorySymbolIndex.h b/clang-tools-extra/clang-include-fixer/InMemorySymbolIndex.h similarity index 100% rename from clang-tools-extra/include-fixer/InMemorySymbolIndex.h rename to clang-tools-extra/clang-include-fixer/InMemorySymbolIndex.h diff --git a/clang-tools-extra/include-fixer/IncludeFixer.cpp b/clang-tools-extra/clang-include-fixer/IncludeFixer.cpp similarity index 98% rename from clang-tools-extra/include-fixer/IncludeFixer.cpp rename to clang-tools-extra/clang-include-fixer/IncludeFixer.cpp index 540b263e35b3..d364021f765f 100644 --- a/clang-tools-extra/include-fixer/IncludeFixer.cpp +++ b/clang-tools-extra/clang-include-fixer/IncludeFixer.cpp @@ -16,7 +16,7 @@ #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" -#define DEBUG_TYPE "include-fixer" +#define DEBUG_TYPE "clang-include-fixer" using namespace clang; @@ -348,8 +348,8 @@ IncludeFixerSemaSource::query(StringRef Query, StringRef ScopedQualifiers, // // We use conservative behavior for detecting the same unidentified symbol // here. The symbols which have the same ScopedQualifier and RawIdentifier - // are considered equal. So that include-fixer avoids false positives, and - // always adds missing qualifiers to correct symbols. + // are considered equal. So that clang-include-fixer avoids false positives, + // and always adds missing qualifiers to correct symbols. if (!GenerateDiagnostics && !QuerySymbolInfos.empty()) { if (ScopedQualifiers == QuerySymbolInfos.front().ScopedQualifiers && Query == QuerySymbolInfos.front().RawIdentifier) { diff --git a/clang-tools-extra/include-fixer/IncludeFixer.h b/clang-tools-extra/clang-include-fixer/IncludeFixer.h similarity index 99% rename from clang-tools-extra/include-fixer/IncludeFixer.h rename to clang-tools-extra/clang-include-fixer/IncludeFixer.h index 5528e895642f..ccab65d2b8b7 100644 --- a/clang-tools-extra/include-fixer/IncludeFixer.h +++ b/clang-tools-extra/clang-include-fixer/IncludeFixer.h @@ -67,7 +67,7 @@ private: /// /// \param Code The source code. /// \param Context The context which contains all information for creating -/// include-fixer replacements. +/// clang-include-fixer replacements. /// \param Style clang-format style being used. /// \param AddQualifiers Whether we should add qualifiers to all instances of /// an unidentified symbol. diff --git a/clang-tools-extra/include-fixer/IncludeFixerContext.cpp b/clang-tools-extra/clang-include-fixer/IncludeFixerContext.cpp similarity index 100% rename from clang-tools-extra/include-fixer/IncludeFixerContext.cpp rename to clang-tools-extra/clang-include-fixer/IncludeFixerContext.cpp diff --git a/clang-tools-extra/include-fixer/IncludeFixerContext.h b/clang-tools-extra/clang-include-fixer/IncludeFixerContext.h similarity index 100% rename from clang-tools-extra/include-fixer/IncludeFixerContext.h rename to clang-tools-extra/clang-include-fixer/IncludeFixerContext.h diff --git a/clang-tools-extra/include-fixer/SymbolIndex.h b/clang-tools-extra/clang-include-fixer/SymbolIndex.h similarity index 100% rename from clang-tools-extra/include-fixer/SymbolIndex.h rename to clang-tools-extra/clang-include-fixer/SymbolIndex.h diff --git a/clang-tools-extra/include-fixer/SymbolIndexManager.cpp b/clang-tools-extra/clang-include-fixer/SymbolIndexManager.cpp similarity index 99% rename from clang-tools-extra/include-fixer/SymbolIndexManager.cpp rename to clang-tools-extra/clang-include-fixer/SymbolIndexManager.cpp index 603b9d4f29db..7b827536e0ae 100644 --- a/clang-tools-extra/include-fixer/SymbolIndexManager.cpp +++ b/clang-tools-extra/clang-include-fixer/SymbolIndexManager.cpp @@ -13,7 +13,7 @@ #include "llvm/Support/Debug.h" #include "llvm/Support/Path.h" -#define DEBUG_TYPE "include-fixer" +#define DEBUG_TYPE "clang-include-fixer" namespace clang { namespace include_fixer { diff --git a/clang-tools-extra/include-fixer/SymbolIndexManager.h b/clang-tools-extra/clang-include-fixer/SymbolIndexManager.h similarity index 100% rename from clang-tools-extra/include-fixer/SymbolIndexManager.h rename to clang-tools-extra/clang-include-fixer/SymbolIndexManager.h diff --git a/clang-tools-extra/include-fixer/YamlSymbolIndex.cpp b/clang-tools-extra/clang-include-fixer/YamlSymbolIndex.cpp similarity index 100% rename from clang-tools-extra/include-fixer/YamlSymbolIndex.cpp rename to clang-tools-extra/clang-include-fixer/YamlSymbolIndex.cpp diff --git a/clang-tools-extra/include-fixer/YamlSymbolIndex.h b/clang-tools-extra/clang-include-fixer/YamlSymbolIndex.h similarity index 100% rename from clang-tools-extra/include-fixer/YamlSymbolIndex.h rename to clang-tools-extra/clang-include-fixer/YamlSymbolIndex.h diff --git a/clang-tools-extra/include-fixer/find-all-symbols/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/CMakeLists.txt rename to clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt diff --git a/clang-tools-extra/include-fixer/find-all-symbols/FindAllMacros.cpp b/clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllMacros.cpp similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/FindAllMacros.cpp rename to clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllMacros.cpp diff --git a/clang-tools-extra/include-fixer/find-all-symbols/FindAllMacros.h b/clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllMacros.h similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/FindAllMacros.h rename to clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllMacros.h diff --git a/clang-tools-extra/include-fixer/find-all-symbols/FindAllSymbols.cpp b/clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbols.cpp similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/FindAllSymbols.cpp rename to clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbols.cpp diff --git a/clang-tools-extra/include-fixer/find-all-symbols/FindAllSymbols.h b/clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbols.h similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/FindAllSymbols.h rename to clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbols.h diff --git a/clang-tools-extra/include-fixer/find-all-symbols/FindAllSymbolsAction.cpp b/clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbolsAction.cpp similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/FindAllSymbolsAction.cpp rename to clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbolsAction.cpp diff --git a/clang-tools-extra/include-fixer/find-all-symbols/FindAllSymbolsAction.h b/clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbolsAction.h similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/FindAllSymbolsAction.h rename to clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbolsAction.h diff --git a/clang-tools-extra/include-fixer/find-all-symbols/HeaderMapCollector.cpp b/clang-tools-extra/clang-include-fixer/find-all-symbols/HeaderMapCollector.cpp similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/HeaderMapCollector.cpp rename to clang-tools-extra/clang-include-fixer/find-all-symbols/HeaderMapCollector.cpp diff --git a/clang-tools-extra/include-fixer/find-all-symbols/HeaderMapCollector.h b/clang-tools-extra/clang-include-fixer/find-all-symbols/HeaderMapCollector.h similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/HeaderMapCollector.h rename to clang-tools-extra/clang-include-fixer/find-all-symbols/HeaderMapCollector.h diff --git a/clang-tools-extra/include-fixer/find-all-symbols/PathConfig.cpp b/clang-tools-extra/clang-include-fixer/find-all-symbols/PathConfig.cpp similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/PathConfig.cpp rename to clang-tools-extra/clang-include-fixer/find-all-symbols/PathConfig.cpp diff --git a/clang-tools-extra/include-fixer/find-all-symbols/PathConfig.h b/clang-tools-extra/clang-include-fixer/find-all-symbols/PathConfig.h similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/PathConfig.h rename to clang-tools-extra/clang-include-fixer/find-all-symbols/PathConfig.h diff --git a/clang-tools-extra/include-fixer/find-all-symbols/PragmaCommentHandler.cpp b/clang-tools-extra/clang-include-fixer/find-all-symbols/PragmaCommentHandler.cpp similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/PragmaCommentHandler.cpp rename to clang-tools-extra/clang-include-fixer/find-all-symbols/PragmaCommentHandler.cpp diff --git a/clang-tools-extra/include-fixer/find-all-symbols/PragmaCommentHandler.h b/clang-tools-extra/clang-include-fixer/find-all-symbols/PragmaCommentHandler.h similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/PragmaCommentHandler.h rename to clang-tools-extra/clang-include-fixer/find-all-symbols/PragmaCommentHandler.h diff --git a/clang-tools-extra/include-fixer/find-all-symbols/STLPostfixHeaderMap.cpp b/clang-tools-extra/clang-include-fixer/find-all-symbols/STLPostfixHeaderMap.cpp similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/STLPostfixHeaderMap.cpp rename to clang-tools-extra/clang-include-fixer/find-all-symbols/STLPostfixHeaderMap.cpp diff --git a/clang-tools-extra/include-fixer/find-all-symbols/STLPostfixHeaderMap.h b/clang-tools-extra/clang-include-fixer/find-all-symbols/STLPostfixHeaderMap.h similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/STLPostfixHeaderMap.h rename to clang-tools-extra/clang-include-fixer/find-all-symbols/STLPostfixHeaderMap.h diff --git a/clang-tools-extra/include-fixer/find-all-symbols/SymbolInfo.cpp b/clang-tools-extra/clang-include-fixer/find-all-symbols/SymbolInfo.cpp similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/SymbolInfo.cpp rename to clang-tools-extra/clang-include-fixer/find-all-symbols/SymbolInfo.cpp diff --git a/clang-tools-extra/include-fixer/find-all-symbols/SymbolInfo.h b/clang-tools-extra/clang-include-fixer/find-all-symbols/SymbolInfo.h similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/SymbolInfo.h rename to clang-tools-extra/clang-include-fixer/find-all-symbols/SymbolInfo.h diff --git a/clang-tools-extra/include-fixer/find-all-symbols/SymbolReporter.h b/clang-tools-extra/clang-include-fixer/find-all-symbols/SymbolReporter.h similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/SymbolReporter.h rename to clang-tools-extra/clang-include-fixer/find-all-symbols/SymbolReporter.h diff --git a/clang-tools-extra/include-fixer/find-all-symbols/tool/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/tool/CMakeLists.txt rename to clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt diff --git a/clang-tools-extra/include-fixer/find-all-symbols/tool/FindAllSymbolsMain.cpp b/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/FindAllSymbolsMain.cpp similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/tool/FindAllSymbolsMain.cpp rename to clang-tools-extra/clang-include-fixer/find-all-symbols/tool/FindAllSymbolsMain.cpp diff --git a/clang-tools-extra/include-fixer/find-all-symbols/tool/run-find-all-symbols.py b/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py similarity index 100% rename from clang-tools-extra/include-fixer/find-all-symbols/tool/run-find-all-symbols.py rename to clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py diff --git a/clang-tools-extra/include-fixer/plugin/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt similarity index 100% rename from clang-tools-extra/include-fixer/plugin/CMakeLists.txt rename to clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt diff --git a/clang-tools-extra/include-fixer/plugin/IncludeFixerPlugin.cpp b/clang-tools-extra/clang-include-fixer/plugin/IncludeFixerPlugin.cpp similarity index 100% rename from clang-tools-extra/include-fixer/plugin/IncludeFixerPlugin.cpp rename to clang-tools-extra/clang-include-fixer/plugin/IncludeFixerPlugin.cpp diff --git a/clang-tools-extra/include-fixer/tool/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/tool/CMakeLists.txt similarity index 100% rename from clang-tools-extra/include-fixer/tool/CMakeLists.txt rename to clang-tools-extra/clang-include-fixer/tool/CMakeLists.txt diff --git a/clang-tools-extra/include-fixer/tool/ClangIncludeFixer.cpp b/clang-tools-extra/clang-include-fixer/tool/ClangIncludeFixer.cpp similarity index 97% rename from clang-tools-extra/include-fixer/tool/ClangIncludeFixer.cpp rename to clang-tools-extra/clang-include-fixer/tool/ClangIncludeFixer.cpp index 64bfdb758e19..15f6ed29d6d5 100644 --- a/clang-tools-extra/include-fixer/tool/ClangIncludeFixer.cpp +++ b/clang-tools-extra/clang-include-fixer/tool/ClangIncludeFixer.cpp @@ -366,8 +366,8 @@ int includeFixerMain(int argc, const char **argv) { } // We leave an empty symbol range as we don't know the range of the symbol - // being queried in this mode. include-fixer won't add namespace qualifiers - // if the symbol range is empty, which also fits this case. + // being queried in this mode. clang-include-fixer won't add namespace + // qualifiers if the symbol range is empty, which also fits this case. IncludeFixerContext::QuerySymbolInfo Symbol; Symbol.RawIdentifier = QuerySymbol; auto Context = @@ -383,9 +383,10 @@ int includeFixerMain(int argc, const char **argv) { if (tool.run(&Factory) != 0) { // We suppress all Clang diagnostics (because they would be wrong, - // include-fixer does custom recovery) but still want to give some feedback - // in case there was a compiler error we couldn't recover from. The most - // common case for this is a #include in the file that couldn't be found. + // clang-include-fixer does custom recovery) but still want to give some + // feedback in case there was a compiler error we couldn't recover from. + // The most common case for this is a #include in the file that couldn't be + // found. llvm::errs() << "Fatal compiler error occurred while parsing file!" " (incorrect include paths?)\n"; return 1; diff --git a/clang-tools-extra/include-fixer/tool/clang-include-fixer-test.el b/clang-tools-extra/clang-include-fixer/tool/clang-include-fixer-test.el similarity index 100% rename from clang-tools-extra/include-fixer/tool/clang-include-fixer-test.el rename to clang-tools-extra/clang-include-fixer/tool/clang-include-fixer-test.el diff --git a/clang-tools-extra/include-fixer/tool/clang-include-fixer.el b/clang-tools-extra/clang-include-fixer/tool/clang-include-fixer.el similarity index 99% rename from clang-tools-extra/include-fixer/tool/clang-include-fixer.el rename to clang-tools-extra/clang-include-fixer/tool/clang-include-fixer.el index 1512402d9e50..84fff6246921 100644 --- a/clang-tools-extra/include-fixer/tool/clang-include-fixer.el +++ b/clang-tools-extra/clang-include-fixer/tool/clang-include-fixer.el @@ -8,7 +8,7 @@ ;; This package allows Emacs users to invoke the 'clang-include-fixer' within ;; Emacs. 'clang-include-fixer' provides an automated way of adding #include ;; directives for missing symbols in one translation unit, see -;; . +;; . ;;; Code: @@ -243,7 +243,7 @@ return nil. Buffer restrictions are ignored." t)))))))))))) (defun clang-include-fixer--add-header (stdout) - "Analyse the result of include-fixer stored in STDOUT. + "Analyse the result of clang-include-fixer stored in STDOUT. Add a missing header if there is any. If there are multiple possible headers the user can select one of them to be included. Temporarily highlight the affected symbols. Asynchronously call @@ -317,7 +317,7 @@ They are replaced by the single element selected by the user." (when overlays (goto-char (clang-include-fixer--closest-overlay overlays))) (cl-flet ((header (info) (let-alist info .Header))) - ;; The header-infos is already sorted by include-fixer. + ;; The header-infos is already sorted by clang-include-fixer. (let* ((headers (mapcar #'header .HeaderInfos)) (header (completing-read (clang-include-fixer--format-message diff --git a/clang-tools-extra/include-fixer/tool/clang-include-fixer.py b/clang-tools-extra/clang-include-fixer/tool/clang-include-fixer.py similarity index 95% rename from clang-tools-extra/include-fixer/tool/clang-include-fixer.py rename to clang-tools-extra/clang-include-fixer/tool/clang-include-fixer.py index 0e9306d1a6ae..4c38f71ef76a 100644 --- a/clang-tools-extra/include-fixer/tool/clang-include-fixer.py +++ b/clang-tools-extra/clang-include-fixer/tool/clang-include-fixer.py @@ -2,12 +2,14 @@ # - Change 'binary' if clang-include-fixer is not on the path (see below). # - Add to your .vimrc: # -# noremap cf :pyf path/to/llvm/source/tools/clang/tools/extra/include-fixer/tool/clang-include-fixer.py +# noremap cf :pyf path/to/llvm/source/tools/clang/tools/extra/clang-include-fixer/tool/clang-include-fixer.py # -# This enables clang-include-fixer for NORMAL and VISUAL mode. Change "cf" -# to another binding if you need clang-include-fixer on a different key. +# This enables clang-include-fixer for NORMAL and VISUAL mode. Change +# "cf" to another binding if you need clang-include-fixer on a +# different key. # -# To set up clang-include-fixer, see http://clang.llvm.org/extra/include-fixer.html +# To set up clang-include-fixer, see +# http://clang.llvm.org/extra/clang-include-fixer.html # # With this integration you can press the bound key and clang-include-fixer will # be run on the current buffer. @@ -76,7 +78,7 @@ def GetUserSelection(message, headers, maximum_suggested_headers): raise Exception() except Exception: # Show a new prompt on invalid option instead of aborting so that users - # don't need to wait for another include-fixer run. + # don't need to wait for another clang-include-fixer run. print >> sys.stderr, "Invalid option:", res return GetUserSelection(message, headers, maximum_suggested_headers) return headers[idx - 1] @@ -170,7 +172,7 @@ def main(): print "The file is fine, no need to add a header." return symbol = query_symbol_infos[0]["RawIdentifier"] - # The header_infos is already sorted by include-fixer. + # The header_infos is already sorted by clang-include-fixer. header_infos = include_fixer_context["HeaderInfos"] # Deduplicate headers while keeping the order, so that the same header would # not be suggested twice. diff --git a/clang-tools-extra/clang-move/Move.cpp b/clang-tools-extra/clang-move/Move.cpp index 9b69b8873ccd..8c56861009e0 100644 --- a/clang-tools-extra/clang-move/Move.cpp +++ b/clang-tools-extra/clang-move/Move.cpp @@ -765,7 +765,7 @@ void ClangMoveTool::removeDeclsInOldFiles() { if (Context->Spec.OldDependOnNew && MakeAbsolutePath(SM, FilePath) == makeAbsolutePath(Context->Spec.OldHeader)) { - // FIXME: Minimize the include path like include-fixer. + // FIXME: Minimize the include path like clang-include-fixer. std::string IncludeNewH = "#include \"" + Context->Spec.NewHeader + "\"\n"; // This replacment for inserting header will be cleaned up at the end. diff --git a/clang-tools-extra/clang-tidy/add_new_check.py b/clang-tools-extra/clang-tidy/add_new_check.py index 898392b179d7..839bd4d3600a 100755 --- a/clang-tools-extra/clang-tidy/add_new_check.py +++ b/clang-tools-extra/clang-tidy/add_new_check.py @@ -198,7 +198,7 @@ def add_release_notes(module_path, module, check_name): lines = f.readlines() lineMatcher = re.compile('Improvements to clang-tidy') - nextSectionMatcher = re.compile('Improvements to include-fixer') + nextSectionMatcher = re.compile('Improvements to clang-include-fixer') checkerMatcher = re.compile('- New :doc:`(.*)') print('Updating %s...' % filename) diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst index fa473d71d4d9..07eab64ab2b6 100644 --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -143,7 +143,7 @@ Improvements to clang-tidy but either don't specify it or the clause is specified but with the kind other than ``none``, and suggests to use the ``default(none)`` clause. -Improvements to include-fixer +Improvements to clang-include-fixer ----------------------------- The improvements are... diff --git a/clang-tools-extra/docs/include-fixer.rst b/clang-tools-extra/docs/clang-include-fixer.rst similarity index 96% rename from clang-tools-extra/docs/include-fixer.rst rename to clang-tools-extra/docs/clang-include-fixer.rst index 9898840cfa29..783f45efe5f2 100644 --- a/clang-tools-extra/docs/include-fixer.rst +++ b/clang-tools-extra/docs/clang-include-fixer.rst @@ -49,7 +49,7 @@ database for LLVM, any project built by CMake should follow similar steps. $ ninja clang-include-fixer // build clang-include-fixer tool. $ ls compile_commands.json # Make sure compile_commands.json exists. compile_commands.json - $ path/to/llvm/source/tools/clang/tools/extra/include-fixer/find-all-symbols/tool/run-find-all-symbols.py + $ path/to/llvm/source/tools/clang/tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py ... wait as clang indexes the code base ... $ ln -s $PWD/find_all_symbols_db.yaml path/to/llvm/source/ # Link database into the source tree. $ ln -s $PWD/compile_commands.json path/to/llvm/source/ # Also link compilation database if it's not there already. @@ -64,7 +64,7 @@ following key binding to your ``.vimrc``: .. code-block:: console - noremap cf :pyf path/to/llvm/source/tools/clang/tools/extra/include-fixer/tool/clang-include-fixer.py + noremap cf :pyf path/to/llvm/source/tools/clang/tools/extra/clang-include-fixer/tool/clang-include-fixer.py This enables `clang-include-fixer` for NORMAL and VISUAL mode. Change `cf` to another binding if you need clang-include-fixer on a different @@ -118,7 +118,7 @@ in your ``.emacs``: .. code-block:: console - (add-to-list 'load-path "path/to/llvm/source/tools/clang/tools/extra/include-fixer/tool/" + (add-to-list 'load-path "path/to/llvm/source/tools/clang/tools/extra/clang-include-fixer/tool/" (require 'clang-include-fixer) Within Emacs the tool can be invoked with the command diff --git a/clang-tools-extra/docs/doxygen.cfg.in b/clang-tools-extra/docs/doxygen.cfg.in index 88095889381d..fd77fc4717aa 100644 --- a/clang-tools-extra/docs/doxygen.cfg.in +++ b/clang-tools-extra/docs/doxygen.cfg.in @@ -752,7 +752,7 @@ INPUT = \ @abs_srcdir@/../clang-reorder-fields \ @abs_srcdir@/../clang-tidy \ @abs_srcdir@/../clangd \ - @abs_srcdir@/../include-fixer \ + @abs_srcdir@/../clang-include-fixer \ @abs_srcdir@/../modularize \ @abs_srcdir@/../pp-trace \ @abs_srcdir@/../tool-template \ diff --git a/clang-tools-extra/docs/index.rst b/clang-tools-extra/docs/index.rst index 86ba5cb7afeb..0fe989529668 100644 --- a/clang-tools-extra/docs/index.rst +++ b/clang-tools-extra/docs/index.rst @@ -16,7 +16,7 @@ Contents :maxdepth: 2 clang-tidy/index - include-fixer + clang-include-fixer modularize pp-trace clang-rename diff --git a/clang-tools-extra/test/include-fixer/Inputs/database_template.json b/clang-tools-extra/test/clang-include-fixer/Inputs/database_template.json similarity index 100% rename from clang-tools-extra/test/include-fixer/Inputs/database_template.json rename to clang-tools-extra/test/clang-include-fixer/Inputs/database_template.json diff --git a/clang-tools-extra/test/include-fixer/Inputs/fake_yaml_db.yaml b/clang-tools-extra/test/clang-include-fixer/Inputs/fake_yaml_db.yaml similarity index 96% rename from clang-tools-extra/test/include-fixer/Inputs/fake_yaml_db.yaml rename to clang-tools-extra/test/clang-include-fixer/Inputs/fake_yaml_db.yaml index b599005e2c3f..134b3758b742 100644 --- a/clang-tools-extra/test/include-fixer/Inputs/fake_yaml_db.yaml +++ b/clang-tools-extra/test/clang-include-fixer/Inputs/fake_yaml_db.yaml @@ -65,7 +65,7 @@ Name: bar Contexts: - ContextType: Namespace ContextName: c -FilePath: test/include-fixer/baz.h +FilePath: test/clang-include-fixer/baz.h Type: Class Seen: 1 Used: 0 diff --git a/clang-tools-extra/test/include-fixer/Inputs/merge/a.yaml b/clang-tools-extra/test/clang-include-fixer/Inputs/merge/a.yaml similarity index 100% rename from clang-tools-extra/test/include-fixer/Inputs/merge/a.yaml rename to clang-tools-extra/test/clang-include-fixer/Inputs/merge/a.yaml diff --git a/clang-tools-extra/test/include-fixer/Inputs/merge/b.yaml b/clang-tools-extra/test/clang-include-fixer/Inputs/merge/b.yaml similarity index 100% rename from clang-tools-extra/test/include-fixer/Inputs/merge/b.yaml rename to clang-tools-extra/test/clang-include-fixer/Inputs/merge/b.yaml diff --git a/clang-tools-extra/test/include-fixer/commandline_options.cpp b/clang-tools-extra/test/clang-include-fixer/commandline_options.cpp similarity index 100% rename from clang-tools-extra/test/include-fixer/commandline_options.cpp rename to clang-tools-extra/test/clang-include-fixer/commandline_options.cpp diff --git a/clang-tools-extra/test/include-fixer/exit_on_fatal.cpp b/clang-tools-extra/test/clang-include-fixer/exit_on_fatal.cpp similarity index 100% rename from clang-tools-extra/test/include-fixer/exit_on_fatal.cpp rename to clang-tools-extra/test/clang-include-fixer/exit_on_fatal.cpp diff --git a/clang-tools-extra/test/include-fixer/fixeddb.cpp b/clang-tools-extra/test/clang-include-fixer/fixeddb.cpp similarity index 100% rename from clang-tools-extra/test/include-fixer/fixeddb.cpp rename to clang-tools-extra/test/clang-include-fixer/fixeddb.cpp diff --git a/clang-tools-extra/test/clang-include-fixer/include_path.cpp b/clang-tools-extra/test/clang-include-fixer/include_path.cpp new file mode 100644 index 000000000000..9185b7af5174 --- /dev/null +++ b/clang-tools-extra/test/clang-include-fixer/include_path.cpp @@ -0,0 +1,19 @@ +// RUN: mkdir -p %T/clang-include-fixer/include +// RUN: mkdir -p %T/clang-include-fixer/symbols +// RUN: mkdir -p %T/clang-include-fixer/build +// RUN: mkdir -p %T/clang-include-fixer/src +// RUN: sed 's|test_dir|%/T/clang-include-fixer|g' %S/Inputs/database_template.json > %T/clang-include-fixer/build/compile_commands.json +// RUN: echo -e '#include "bar.h"\nb::a::bar f;' > %T/clang-include-fixer/src/bar.cpp +// RUN: echo 'namespace b { namespace a { class bar {}; } }' > %T/clang-include-fixer/include/bar.h +// RUN: cd %T/clang-include-fixer/build +// RUN: find-all-symbols -output-dir=%T/clang-include-fixer/symbols -p=. %T/clang-include-fixer/src/bar.cpp +// RUN: find-all-symbols -merge-dir=%T/clang-include-fixer/symbols %T/clang-include-fixer/build/find_all_symbols.yaml +// RUN: FileCheck -input-file=%T/clang-include-fixer/build/find_all_symbols.yaml -check-prefix=CHECK-YAML %s +// +// RUN: echo 'b::a::bar f;' > %T/clang-include-fixer/src/bar.cpp +// RUN: clang-include-fixer -db=yaml -input=%T/clang-include-fixer/build/find_all_symbols.yaml -minimize-paths=true -p=. %T/clang-include-fixer/src/bar.cpp +// RUN: FileCheck -input-file=%T/clang-include-fixer/src/bar.cpp %s + +// CHECK-YAML: ..{{[/\\]}}include{{[/\\]}}bar.h +// CHECK: #include "bar.h" +// CHECK: b::a::bar f; diff --git a/clang-tools-extra/test/include-fixer/merge.test b/clang-tools-extra/test/clang-include-fixer/merge.test similarity index 100% rename from clang-tools-extra/test/include-fixer/merge.test rename to clang-tools-extra/test/clang-include-fixer/merge.test diff --git a/clang-tools-extra/test/clang-include-fixer/multiple_fixes.cpp b/clang-tools-extra/test/clang-include-fixer/multiple_fixes.cpp new file mode 100644 index 000000000000..791417a3682a --- /dev/null +++ b/clang-tools-extra/test/clang-include-fixer/multiple_fixes.cpp @@ -0,0 +1,13 @@ +// REQUIRES: shell +// RUN: sed -e 's#//.*$##' %s > %t.cpp +// RUN: mkdir -p %T/clang-include-fixer/multiple-fixes +// RUN: echo 'foo f;' > %T/clang-include-fixer/multiple-fixes/foo.cpp +// RUN: echo 'bar b;' > %T/clang-include-fixer/multiple-fixes/bar.cpp +// RUN: clang-include-fixer -db=fixed -input='foo= "foo.h";bar= "bar.h"' %T/clang-include-fixer/multiple-fixes/*.cpp -- +// RUN: FileCheck -input-file=%T/clang-include-fixer/multiple-fixes/bar.cpp %s -check-prefix=CHECK-BAR +// RUN: FileCheck -input-file=%T/clang-include-fixer/multiple-fixes/foo.cpp %s -check-prefix=CHECK-FOO +// +// CHECK-FOO: #include "foo.h" +// CHECK-FOO: foo f; +// CHECK-BAR: #include "bar.h" +// CHECK-BAR: bar b; diff --git a/clang-tools-extra/test/include-fixer/prefix_variable.cpp b/clang-tools-extra/test/clang-include-fixer/prefix_variable.cpp similarity index 100% rename from clang-tools-extra/test/include-fixer/prefix_variable.cpp rename to clang-tools-extra/test/clang-include-fixer/prefix_variable.cpp diff --git a/clang-tools-extra/test/include-fixer/query_symbol.cpp b/clang-tools-extra/test/clang-include-fixer/query_symbol.cpp similarity index 100% rename from clang-tools-extra/test/include-fixer/query_symbol.cpp rename to clang-tools-extra/test/clang-include-fixer/query_symbol.cpp diff --git a/clang-tools-extra/test/include-fixer/ranking.cpp b/clang-tools-extra/test/clang-include-fixer/ranking.cpp similarity index 89% rename from clang-tools-extra/test/include-fixer/ranking.cpp rename to clang-tools-extra/test/clang-include-fixer/ranking.cpp index 2dabe16fa639..ee54d4c7ee99 100644 --- a/clang-tools-extra/test/include-fixer/ranking.cpp +++ b/clang-tools-extra/test/clang-include-fixer/ranking.cpp @@ -2,7 +2,7 @@ // RUN: clang-include-fixer -query-symbol bar -db=yaml -input=%S/Inputs/fake_yaml_db.yaml -output-headers %s -- | FileCheck %s // CHECK: "HeaderInfos": [ -// CHECK-NEXT: {"Header": "\"test/include-fixer/baz.h\"", +// CHECK-NEXT: {"Header": "\"test/clang-include-fixer/baz.h\"", // CHECK-NEXT: "QualifiedName": "c::bar"}, // CHECK-NEXT: {"Header": "\"../include/bar.h\"", // CHECK-NEXT: "QualifiedName": "b::a::bar"}, diff --git a/clang-tools-extra/test/include-fixer/yaml_fuzzy.cpp b/clang-tools-extra/test/clang-include-fixer/yaml_fuzzy.cpp similarity index 74% rename from clang-tools-extra/test/include-fixer/yaml_fuzzy.cpp rename to clang-tools-extra/test/clang-include-fixer/yaml_fuzzy.cpp index 705542dd0d10..9a3daacb8250 100644 --- a/clang-tools-extra/test/include-fixer/yaml_fuzzy.cpp +++ b/clang-tools-extra/test/clang-include-fixer/yaml_fuzzy.cpp @@ -2,7 +2,7 @@ // RUN: clang-include-fixer -db=fuzzyYaml -input=%p/Inputs/fake_yaml_db.yaml %t.cpp -- // RUN: FileCheck %s -input-file=%t.cpp -// include-fixer will add the include, but doesn't complete the symbol. +// clang-include-fixer will add the include, but doesn't complete the symbol. // CHECK: #include "foobar.h" // CHECK: fba f; diff --git a/clang-tools-extra/test/include-fixer/yamldb.cpp b/clang-tools-extra/test/clang-include-fixer/yamldb.cpp similarity index 100% rename from clang-tools-extra/test/include-fixer/yamldb.cpp rename to clang-tools-extra/test/clang-include-fixer/yamldb.cpp diff --git a/clang-tools-extra/test/include-fixer/yamldb_autodetect.cpp b/clang-tools-extra/test/clang-include-fixer/yamldb_autodetect.cpp similarity index 100% rename from clang-tools-extra/test/include-fixer/yamldb_autodetect.cpp rename to clang-tools-extra/test/clang-include-fixer/yamldb_autodetect.cpp diff --git a/clang-tools-extra/test/include-fixer/include_path.cpp b/clang-tools-extra/test/include-fixer/include_path.cpp deleted file mode 100644 index 28b6ace5f592..000000000000 --- a/clang-tools-extra/test/include-fixer/include_path.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// RUN: mkdir -p %T/include-fixer/include -// RUN: mkdir -p %T/include-fixer/symbols -// RUN: mkdir -p %T/include-fixer/build -// RUN: mkdir -p %T/include-fixer/src -// RUN: sed 's|test_dir|%/T/include-fixer|g' %S/Inputs/database_template.json > %T/include-fixer/build/compile_commands.json -// RUN: echo -e '#include "bar.h"\nb::a::bar f;' > %T/include-fixer/src/bar.cpp -// RUN: echo 'namespace b { namespace a { class bar {}; } }' > %T/include-fixer/include/bar.h -// RUN: cd %T/include-fixer/build -// RUN: find-all-symbols -output-dir=%T/include-fixer/symbols -p=. %T/include-fixer/src/bar.cpp -// RUN: find-all-symbols -merge-dir=%T/include-fixer/symbols %T/include-fixer/build/find_all_symbols.yaml -// RUN: FileCheck -input-file=%T/include-fixer/build/find_all_symbols.yaml -check-prefix=CHECK-YAML %s -// -// RUN: echo 'b::a::bar f;' > %T/include-fixer/src/bar.cpp -// RUN: clang-include-fixer -db=yaml -input=%T/include-fixer/build/find_all_symbols.yaml -minimize-paths=true -p=. %T/include-fixer/src/bar.cpp -// RUN: FileCheck -input-file=%T/include-fixer/src/bar.cpp %s - -// CHECK-YAML: ..{{[/\\]}}include{{[/\\]}}bar.h -// CHECK: #include "bar.h" -// CHECK: b::a::bar f; diff --git a/clang-tools-extra/test/include-fixer/multiple_fixes.cpp b/clang-tools-extra/test/include-fixer/multiple_fixes.cpp deleted file mode 100644 index 35a73b4a0afe..000000000000 --- a/clang-tools-extra/test/include-fixer/multiple_fixes.cpp +++ /dev/null @@ -1,13 +0,0 @@ -// REQUIRES: shell -// RUN: sed -e 's#//.*$##' %s > %t.cpp -// RUN: mkdir -p %T/include-fixer/multiple-fixes -// RUN: echo 'foo f;' > %T/include-fixer/multiple-fixes/foo.cpp -// RUN: echo 'bar b;' > %T/include-fixer/multiple-fixes/bar.cpp -// RUN: clang-include-fixer -db=fixed -input='foo= "foo.h";bar= "bar.h"' %T/include-fixer/multiple-fixes/*.cpp -- -// RUN: FileCheck -input-file=%T/include-fixer/multiple-fixes/bar.cpp %s -check-prefix=CHECK-BAR -// RUN: FileCheck -input-file=%T/include-fixer/multiple-fixes/foo.cpp %s -check-prefix=CHECK-FOO -// -// CHECK-FOO: #include "foo.h" -// CHECK-FOO: foo f; -// CHECK-BAR: #include "bar.h" -// CHECK-BAR: bar b; diff --git a/clang-tools-extra/unittests/CMakeLists.txt b/clang-tools-extra/unittests/CMakeLists.txt index 400873777481..ce6e6651aebf 100644 --- a/clang-tools-extra/unittests/CMakeLists.txt +++ b/clang-tools-extra/unittests/CMakeLists.txt @@ -17,8 +17,8 @@ endif() add_subdirectory(clang-apply-replacements) add_subdirectory(clang-change-namespace) add_subdirectory(clang-doc) +add_subdirectory(clang-include-fixer) add_subdirectory(clang-move) add_subdirectory(clang-query) add_subdirectory(clang-tidy) add_subdirectory(clangd) -add_subdirectory(include-fixer) diff --git a/clang-tools-extra/unittests/include-fixer/CMakeLists.txt b/clang-tools-extra/unittests/clang-include-fixer/CMakeLists.txt similarity index 89% rename from clang-tools-extra/unittests/include-fixer/CMakeLists.txt rename to clang-tools-extra/unittests/clang-include-fixer/CMakeLists.txt index c084a4df1b34..deb5a187c6b3 100644 --- a/clang-tools-extra/unittests/include-fixer/CMakeLists.txt +++ b/clang-tools-extra/unittests/clang-include-fixer/CMakeLists.txt @@ -3,7 +3,7 @@ set(LLVM_LINK_COMPONENTS ) get_filename_component(INCLUDE_FIXER_SOURCE_DIR - ${CMAKE_CURRENT_SOURCE_DIR}/../../include-fixer REALPATH) + ${CMAKE_CURRENT_SOURCE_DIR}/../../clang-include-fixer REALPATH) include_directories( ${INCLUDE_FIXER_SOURCE_DIR} ) diff --git a/clang-tools-extra/unittests/include-fixer/FuzzySymbolIndexTests.cpp b/clang-tools-extra/unittests/clang-include-fixer/FuzzySymbolIndexTests.cpp similarity index 100% rename from clang-tools-extra/unittests/include-fixer/FuzzySymbolIndexTests.cpp rename to clang-tools-extra/unittests/clang-include-fixer/FuzzySymbolIndexTests.cpp diff --git a/clang-tools-extra/unittests/include-fixer/IncludeFixerTest.cpp b/clang-tools-extra/unittests/clang-include-fixer/IncludeFixerTest.cpp similarity index 99% rename from clang-tools-extra/unittests/include-fixer/IncludeFixerTest.cpp rename to clang-tools-extra/unittests/clang-include-fixer/IncludeFixerTest.cpp index 9b187485a812..ab7ef7973a75 100644 --- a/clang-tools-extra/unittests/include-fixer/IncludeFixerTest.cpp +++ b/clang-tools-extra/unittests/clang-include-fixer/IncludeFixerTest.cpp @@ -178,7 +178,7 @@ TEST(IncludeFixer, NestedName) { EXPECT_EQ("#define FOO(x) a::##x\nint x = FOO(b::foo);\n", runIncludeFixer("#define FOO(x) a::##x\nint x = FOO(b::foo);\n")); - // The empty namespace is cleaned up by clang-format after include-fixer + // The empty namespace is cleaned up by clang-format after clang-include-fixer // finishes. EXPECT_EQ("#include \"dir/otherdir/qux.h\"\n" "\nint a = a::b::foo(0);\n", @@ -227,7 +227,7 @@ TEST(IncludeFixer, IgnoreSymbolFromHeader) { } // FIXME: add test cases for inserting and sorting multiple headers when -// include-fixer supports multiple headers insertion. +// clang-include-fixer supports multiple headers insertion. TEST(IncludeFixer, InsertAndSortSingleHeader) { // Insert one header. std::string Code = "#include \"a.h\"\n" diff --git a/clang-tools-extra/unittests/include-fixer/find-all-symbols/CMakeLists.txt b/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/CMakeLists.txt similarity index 82% rename from clang-tools-extra/unittests/include-fixer/find-all-symbols/CMakeLists.txt rename to clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/CMakeLists.txt index 6a5472eedeb8..427aa8ed86fb 100644 --- a/clang-tools-extra/unittests/include-fixer/find-all-symbols/CMakeLists.txt +++ b/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/CMakeLists.txt @@ -3,7 +3,7 @@ set(LLVM_LINK_COMPONENTS ) get_filename_component(INCLUDE_FIXER_SOURCE_DIR - ${CMAKE_CURRENT_SOURCE_DIR}/../../../include-fixer/find-all-symbols REALPATH) + ${CMAKE_CURRENT_SOURCE_DIR}/../../../clang-include-fixer/find-all-symbols REALPATH) include_directories( ${INCLUDE_FIXER_SOURCE_DIR} ) diff --git a/clang-tools-extra/unittests/include-fixer/find-all-symbols/FindAllSymbolsTests.cpp b/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/FindAllSymbolsTests.cpp similarity index 100% rename from clang-tools-extra/unittests/include-fixer/find-all-symbols/FindAllSymbolsTests.cpp rename to clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/FindAllSymbolsTests.cpp