From 915f9785e052150f268bc62a9ce00fcae2b5558c Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Wed, 4 Sep 2019 09:46:06 +0000 Subject: [PATCH] [clangd] Rename ClangdUnit.h -> ParsedAST.h. NFC This much better reflects what is (now) in this header. Maybe a rename to ParsedTU would be an improvement, but that's a much more invasive change and life is too short. ClangdUnit is dead, long live ClangdUnitTests! llvm-svn: 370862 --- clang-tools-extra/clangd/CMakeLists.txt | 2 +- clang-tools-extra/clangd/ClangdServer.cpp | 2 +- clang-tools-extra/clangd/FindSymbols.cpp | 2 +- .../clangd/{ClangdUnit.cpp => ParsedAST.cpp} | 4 +-- .../clangd/{ClangdUnit.h => ParsedAST.h} | 20 ++++++++++--- clang-tools-extra/clangd/Preamble.cpp | 2 +- .../clangd/SemanticHighlighting.cpp | 1 + .../clangd/SemanticHighlighting.h | 2 +- clang-tools-extra/clangd/TUScheduler.cpp | 2 +- clang-tools-extra/clangd/XRefs.cpp | 1 + clang-tools-extra/clangd/XRefs.h | 5 +++- clang-tools-extra/clangd/index/Background.cpp | 2 +- .../clangd/index/BackgroundRebuild.cpp | 2 +- clang-tools-extra/clangd/index/FileIndex.cpp | 2 +- clang-tools-extra/clangd/refactor/Rename.cpp | 2 +- clang-tools-extra/clangd/refactor/Tweak.h | 2 +- .../refactor/tweaks/ExtractFunction.cpp | 2 +- .../refactor/tweaks/ExtractVariable.cpp | 2 +- .../refactor/tweaks/RawStringLiteral.cpp | 2 +- .../clangd/refactor/tweaks/SwapIfBranches.cpp | 2 +- .../clangd/unittests/CMakeLists.txt | 2 +- .../clangd/unittests/DiagnosticsTests.cpp | 2 +- .../clangd/unittests/ExpectedTypeTest.cpp | 2 +- .../clangd/unittests/FileIndexTests.cpp | 2 +- ...ClangdUnitTests.cpp => ParsedASTTests.cpp} | 28 +++++++++++-------- .../clangd/unittests/SourceCodeTests.cpp | 2 +- .../clangd/unittests/SymbolInfoTests.cpp | 2 +- .../clangd/unittests/TUSchedulerTests.cpp | 2 +- clang-tools-extra/clangd/unittests/TestTU.h | 2 +- .../clangd/unittests/TypeHierarchyTests.cpp | 2 +- .../clangd/unittests/XRefsTests.cpp | 2 +- 31 files changed, 65 insertions(+), 44 deletions(-) rename clang-tools-extra/clangd/{ClangdUnit.cpp => ParsedAST.cpp} (99%) rename clang-tools-extra/clangd/{ClangdUnit.h => ParsedAST.h} (89%) rename clang-tools-extra/clangd/unittests/{ClangdUnitTests.cpp => ParsedASTTests.cpp} (91%) diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt index 0461c9924b75..8d622c2c572a 100644 --- a/clang-tools-extra/clangd/CMakeLists.txt +++ b/clang-tools-extra/clangd/CMakeLists.txt @@ -39,7 +39,6 @@ add_clang_library(clangDaemon Cancellation.cpp ClangdLSPServer.cpp ClangdServer.cpp - ClangdUnit.cpp CodeComplete.cpp CodeCompletionStrings.cpp Compiler.cpp @@ -62,6 +61,7 @@ add_clang_library(clangDaemon Logger.cpp Protocol.cpp Quality.cpp + ParsedAST.cpp Preamble.cpp RIFF.cpp Selection.cpp diff --git a/clang-tools-extra/clangd/ClangdServer.cpp b/clang-tools-extra/clangd/ClangdServer.cpp index ec775149901e..695c5e7754f8 100644 --- a/clang-tools-extra/clangd/ClangdServer.cpp +++ b/clang-tools-extra/clangd/ClangdServer.cpp @@ -7,12 +7,12 @@ //===-------------------------------------------------------------------===// #include "ClangdServer.h" -#include "ClangdUnit.h" #include "CodeComplete.h" #include "FindSymbols.h" #include "Format.h" #include "FormattedString.h" #include "Headers.h" +#include "ParsedAST.h" #include "Preamble.h" #include "Protocol.h" #include "SemanticHighlighting.h" diff --git a/clang-tools-extra/clangd/FindSymbols.cpp b/clang-tools-extra/clangd/FindSymbols.cpp index 695f5f9e1504..287a8a4df0b4 100644 --- a/clang-tools-extra/clangd/FindSymbols.cpp +++ b/clang-tools-extra/clangd/FindSymbols.cpp @@ -8,9 +8,9 @@ #include "FindSymbols.h" #include "AST.h" -#include "ClangdUnit.h" #include "FuzzyMatch.h" #include "Logger.h" +#include "ParsedAST.h" #include "Quality.h" #include "SourceCode.h" #include "index/Index.h" diff --git a/clang-tools-extra/clangd/ClangdUnit.cpp b/clang-tools-extra/clangd/ParsedAST.cpp similarity index 99% rename from clang-tools-extra/clangd/ClangdUnit.cpp rename to clang-tools-extra/clangd/ParsedAST.cpp index 7cc8f07cebfc..d3f9b8b1f577 100644 --- a/clang-tools-extra/clangd/ClangdUnit.cpp +++ b/clang-tools-extra/clangd/ParsedAST.cpp @@ -1,4 +1,4 @@ -//===--- ClangdUnit.cpp ------------------------------------------*- C++-*-===// +//===--- ParsedAST.cpp -------------------------------------------*- C++-*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "ClangdUnit.h" +#include "ParsedAST.h" #include "../clang-tidy/ClangTidyDiagnosticConsumer.h" #include "../clang-tidy/ClangTidyModuleRegistry.h" #include "AST.h" diff --git a/clang-tools-extra/clangd/ClangdUnit.h b/clang-tools-extra/clangd/ParsedAST.h similarity index 89% rename from clang-tools-extra/clangd/ClangdUnit.h rename to clang-tools-extra/clangd/ParsedAST.h index cf3badf580f4..5486e91dd1e5 100644 --- a/clang-tools-extra/clangd/ClangdUnit.h +++ b/clang-tools-extra/clangd/ParsedAST.h @@ -1,13 +1,25 @@ -//===--- ClangdUnit.h --------------------------------------------*- C++-*-===// +//===--- ParsedAST.h - Building translation units ----------------*- C++-*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// +// +// This file exposes building a file as if it were open in clangd, and defines +// the ParsedAST structure that holds the results. +// +// This is similar to a clang -fsyntax-only run that produces a clang AST, but +// we have several customizations: +// - preamble handling +// - capturing diagnostics for later access +// - running clang-tidy checks checks +// +// +//===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_CLANGDUNIT_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_CLANGDUNIT_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_PARSEDAST_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_PARSEDAST_H #include "Compiler.h" #include "Diagnostics.h" @@ -136,4 +148,4 @@ void dumpAST(ParsedAST &AST, llvm::raw_ostream &OS); } // namespace clangd } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_CLANGDUNIT_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_PARSEDAST_H diff --git a/clang-tools-extra/clangd/Preamble.cpp b/clang-tools-extra/clangd/Preamble.cpp index 5e890fd16d49..72f55e003922 100644 --- a/clang-tools-extra/clangd/Preamble.cpp +++ b/clang-tools-extra/clangd/Preamble.cpp @@ -25,7 +25,7 @@ bool compileCommandsAreEqual(const tooling::CompileCommand &LHS, } // This collects macro definitions in the *preamble region* of the main file. -// (Contrast with CollectMainFileMacroExpansions in ClangdUnit.cpp, which +// (Contrast with CollectMainFileMacroExpansions in ParsedAST.cpp, which // collects macro *expansions* in the rest of the main file. class CollectMainFileMacros : public PPCallbacks { public: diff --git a/clang-tools-extra/clangd/SemanticHighlighting.cpp b/clang-tools-extra/clangd/SemanticHighlighting.cpp index eaa57f8ab660..268f311d1650 100644 --- a/clang-tools-extra/clangd/SemanticHighlighting.cpp +++ b/clang-tools-extra/clangd/SemanticHighlighting.cpp @@ -8,6 +8,7 @@ #include "SemanticHighlighting.h" #include "Logger.h" +#include "ParsedAST.h" #include "Protocol.h" #include "SourceCode.h" #include "clang/AST/ASTContext.h" diff --git a/clang-tools-extra/clangd/SemanticHighlighting.h b/clang-tools-extra/clangd/SemanticHighlighting.h index 6d58884ac434..f78763fff01c 100644 --- a/clang-tools-extra/clangd/SemanticHighlighting.h +++ b/clang-tools-extra/clangd/SemanticHighlighting.h @@ -17,11 +17,11 @@ #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_SEMANTICHIGHLIGHTING_H #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_SEMANTICHIGHLIGHTING_H -#include "ClangdUnit.h" #include "Protocol.h" namespace clang { namespace clangd { +class ParsedAST; enum class HighlightingKind { Variable = 0, diff --git a/clang-tools-extra/clangd/TUScheduler.cpp b/clang-tools-extra/clangd/TUScheduler.cpp index 98f394569aa2..c9cd7cf0c4e6 100644 --- a/clang-tools-extra/clangd/TUScheduler.cpp +++ b/clang-tools-extra/clangd/TUScheduler.cpp @@ -43,11 +43,11 @@ #include "TUScheduler.h" #include "Cancellation.h" -#include "ClangdUnit.h" #include "Compiler.h" #include "Diagnostics.h" #include "GlobalCompilationDatabase.h" #include "Logger.h" +#include "ParsedAST.h" #include "Preamble.h" #include "Trace.h" #include "index/CanonicalIncludes.h" diff --git a/clang-tools-extra/clangd/XRefs.cpp b/clang-tools-extra/clangd/XRefs.cpp index 1b500c9398bf..b21987e6a5a4 100644 --- a/clang-tools-extra/clangd/XRefs.cpp +++ b/clang-tools-extra/clangd/XRefs.cpp @@ -11,6 +11,7 @@ #include "FindSymbols.h" #include "FormattedString.h" #include "Logger.h" +#include "ParsedAST.h" #include "Protocol.h" #include "SourceCode.h" #include "URI.h" diff --git a/clang-tools-extra/clangd/XRefs.h b/clang-tools-extra/clangd/XRefs.h index 3044036c17f1..d6b3930f513b 100644 --- a/clang-tools-extra/clangd/XRefs.h +++ b/clang-tools-extra/clangd/XRefs.h @@ -13,11 +13,13 @@ #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_XREFS_H #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_XREFS_H -#include "ClangdUnit.h" #include "FormattedString.h" +#include "Path.h" #include "Protocol.h" #include "index/Index.h" +#include "clang/AST/Type.h" #include "index/SymbolLocation.h" +#include "clang/Format/Format.h" #include "clang/Index/IndexSymbol.h" #include "llvm/ADT/Optional.h" #include "llvm/Support/raw_ostream.h" @@ -25,6 +27,7 @@ namespace clang { namespace clangd { +class ParsedAST; // Describes where a symbol is declared and defined (as far as clangd knows). // There are three cases: diff --git a/clang-tools-extra/clangd/index/Background.cpp b/clang-tools-extra/clangd/index/Background.cpp index b58236ef7d8a..9ea21fdf6c59 100644 --- a/clang-tools-extra/clangd/index/Background.cpp +++ b/clang-tools-extra/clangd/index/Background.cpp @@ -7,12 +7,12 @@ //===----------------------------------------------------------------------===// #include "index/Background.h" -#include "ClangdUnit.h" #include "Compiler.h" #include "Context.h" #include "FSProvider.h" #include "Headers.h" #include "Logger.h" +#include "ParsedAST.h" #include "Path.h" #include "SourceCode.h" #include "Symbol.h" diff --git a/clang-tools-extra/clangd/index/BackgroundRebuild.cpp b/clang-tools-extra/clangd/index/BackgroundRebuild.cpp index cb6ac0fc8bf7..5cc61a6decb6 100644 --- a/clang-tools-extra/clangd/index/BackgroundRebuild.cpp +++ b/clang-tools-extra/clangd/index/BackgroundRebuild.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "index/BackgroundRebuild.h" -#include "ClangdUnit.h" #include "Compiler.h" #include "Headers.h" #include "Logger.h" +#include "ParsedAST.h" #include "Path.h" #include "SourceCode.h" #include "Symbol.h" diff --git a/clang-tools-extra/clangd/index/FileIndex.cpp b/clang-tools-extra/clangd/index/FileIndex.cpp index 95419af7be09..189fd772657e 100644 --- a/clang-tools-extra/clangd/index/FileIndex.cpp +++ b/clang-tools-extra/clangd/index/FileIndex.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "FileIndex.h" -#include "ClangdUnit.h" #include "Logger.h" +#include "ParsedAST.h" #include "SymbolCollector.h" #include "index/CanonicalIncludes.h" #include "index/Index.h" diff --git a/clang-tools-extra/clangd/refactor/Rename.cpp b/clang-tools-extra/clangd/refactor/Rename.cpp index d62e1db52dfc..306c804bb599 100644 --- a/clang-tools-extra/clangd/refactor/Rename.cpp +++ b/clang-tools-extra/clangd/refactor/Rename.cpp @@ -8,8 +8,8 @@ #include "refactor/Rename.h" #include "AST.h" -#include "ClangdUnit.h" #include "Logger.h" +#include "ParsedAST.h" #include "SourceCode.h" #include "index/SymbolCollector.h" #include "clang/Tooling/Refactoring/Rename/RenamingAction.h" diff --git a/clang-tools-extra/clangd/refactor/Tweak.h b/clang-tools-extra/clangd/refactor/Tweak.h index 9b20d151589a..172898882ccf 100644 --- a/clang-tools-extra/clangd/refactor/Tweak.h +++ b/clang-tools-extra/clangd/refactor/Tweak.h @@ -19,7 +19,7 @@ #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_REFACTOR_ACTIONS_TWEAK_H #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_REFACTOR_ACTIONS_TWEAK_H -#include "ClangdUnit.h" +#include "ParsedAST.h" #include "Protocol.h" #include "Selection.h" #include "clang/Tooling/Core/Replacement.h" diff --git a/clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp b/clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp index e6715c8cfba7..93c272d56b1e 100644 --- a/clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp +++ b/clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp @@ -47,8 +47,8 @@ //===----------------------------------------------------------------------===// #include "AST.h" -#include "ClangdUnit.h" #include "Logger.h" +#include "ParsedAST.h" #include "Selection.h" #include "SourceCode.h" #include "refactor/Tweak.h" diff --git a/clang-tools-extra/clangd/refactor/tweaks/ExtractVariable.cpp b/clang-tools-extra/clangd/refactor/tweaks/ExtractVariable.cpp index ec11624b8ee3..85a968626098 100644 --- a/clang-tools-extra/clangd/refactor/tweaks/ExtractVariable.cpp +++ b/clang-tools-extra/clangd/refactor/tweaks/ExtractVariable.cpp @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include "ClangdUnit.h" #include "Logger.h" +#include "ParsedAST.h" #include "Protocol.h" #include "Selection.h" #include "SourceCode.h" diff --git a/clang-tools-extra/clangd/refactor/tweaks/RawStringLiteral.cpp b/clang-tools-extra/clangd/refactor/tweaks/RawStringLiteral.cpp index ced15a2a8229..e38cf63219b3 100644 --- a/clang-tools-extra/clangd/refactor/tweaks/RawStringLiteral.cpp +++ b/clang-tools-extra/clangd/refactor/tweaks/RawStringLiteral.cpp @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include "ClangdUnit.h" #include "Logger.h" +#include "ParsedAST.h" #include "SourceCode.h" #include "refactor/Tweak.h" #include "clang/AST/ASTContext.h" diff --git a/clang-tools-extra/clangd/refactor/tweaks/SwapIfBranches.cpp b/clang-tools-extra/clangd/refactor/tweaks/SwapIfBranches.cpp index 36edf0869bf6..82617f4fe013 100644 --- a/clang-tools-extra/clangd/refactor/tweaks/SwapIfBranches.cpp +++ b/clang-tools-extra/clangd/refactor/tweaks/SwapIfBranches.cpp @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include "ClangdUnit.h" #include "Logger.h" +#include "ParsedAST.h" #include "SourceCode.h" #include "refactor/Tweak.h" #include "clang/AST/ASTContext.h" diff --git a/clang-tools-extra/clangd/unittests/CMakeLists.txt b/clang-tools-extra/clangd/unittests/CMakeLists.txt index 368a89956908..913401c72fcd 100644 --- a/clang-tools-extra/clangd/unittests/CMakeLists.txt +++ b/clang-tools-extra/clangd/unittests/CMakeLists.txt @@ -28,7 +28,6 @@ add_unittest(ClangdUnitTests ClangdTests CancellationTests.cpp CanonicalIncludesTests.cpp ClangdTests.cpp - ClangdUnitTests.cpp CodeCompleteTests.cpp CodeCompletionStringsTests.cpp ContextTests.cpp @@ -50,6 +49,7 @@ add_unittest(ClangdUnitTests ClangdTests IndexActionTests.cpp IndexTests.cpp JSONTransportTests.cpp + ParsedASTTests.cpp PrintASTTests.cpp QualityTests.cpp RenameTests.cpp diff --git a/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp b/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp index 2089c89e0664..129b8c23c642 100644 --- a/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp +++ b/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "Annotations.h" -#include "ClangdUnit.h" #include "Diagnostics.h" +#include "ParsedAST.h" #include "Path.h" #include "Protocol.h" #include "SourceCode.h" diff --git a/clang-tools-extra/clangd/unittests/ExpectedTypeTest.cpp b/clang-tools-extra/clangd/unittests/ExpectedTypeTest.cpp index 0315f4de7482..f9bfef398fb5 100644 --- a/clang-tools-extra/clangd/unittests/ExpectedTypeTest.cpp +++ b/clang-tools-extra/clangd/unittests/ExpectedTypeTest.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "ClangdUnit.h" #include "ExpectedTypes.h" +#include "ParsedAST.h" #include "TestTU.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" diff --git a/clang-tools-extra/clangd/unittests/FileIndexTests.cpp b/clang-tools-extra/clangd/unittests/FileIndexTests.cpp index f7b5ecafb8ad..61f6e60c3a21 100644 --- a/clang-tools-extra/clangd/unittests/FileIndexTests.cpp +++ b/clang-tools-extra/clangd/unittests/FileIndexTests.cpp @@ -8,8 +8,8 @@ #include "AST.h" #include "Annotations.h" -#include "ClangdUnit.h" #include "Compiler.h" +#include "ParsedAST.h" #include "SyncAPI.h" #include "TestFS.h" #include "TestTU.h" diff --git a/clang-tools-extra/clangd/unittests/ClangdUnitTests.cpp b/clang-tools-extra/clangd/unittests/ParsedASTTests.cpp similarity index 91% rename from clang-tools-extra/clangd/unittests/ClangdUnitTests.cpp rename to clang-tools-extra/clangd/unittests/ParsedASTTests.cpp index 8926d8849f6d..da55e541d039 100644 --- a/clang-tools-extra/clangd/unittests/ClangdUnitTests.cpp +++ b/clang-tools-extra/clangd/unittests/ParsedASTTests.cpp @@ -1,16 +1,21 @@ -//===-- ClangdUnitTests.cpp - ClangdUnit tests ------------------*- C++ -*-===// +//===-- ParsedASTTests.cpp ------------------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// +// +// These tests cover clangd's logic to build a TU, which generally uses the APIs +// in ParsedAST and Preamble, via the TestTU helper. +// +//===----------------------------------------------------------------------===// #include "AST.h" #include "Annotations.h" -#include "ClangdUnit.h" #include "Compiler.h" #include "Diagnostics.h" +#include "ParsedAST.h" #include "SourceCode.h" #include "TestFS.h" #include "TestTU.h" @@ -26,9 +31,9 @@ namespace clang { namespace clangd { namespace { +using ::testing::AllOf; using ::testing::ElementsAre; using ::testing::ElementsAreArray; -using ::testing::AllOf; MATCHER_P(DeclNamed, Name, "") { if (NamedDecl *ND = dyn_cast(arg)) @@ -66,7 +71,7 @@ MATCHER_P(WithTemplateArgs, ArgName, "") { return false; } -TEST(ClangdUnitTest, TopLevelDecls) { +TEST(ParsedASTTest, TopLevelDecls) { TestTU TU; TU.HeaderCode = R"( int header1(); @@ -77,7 +82,7 @@ TEST(ClangdUnitTest, TopLevelDecls) { EXPECT_THAT(AST.getLocalTopLevelDecls(), ElementsAre(DeclNamed("main"))); } -TEST(ClangdUnitTest, DoesNotGetIncludedTopDecls) { +TEST(ParsedASTTest, DoesNotGetIncludedTopDecls) { TestTU TU; TU.HeaderCode = R"cpp( #define LL void foo(){} @@ -97,7 +102,7 @@ TEST(ClangdUnitTest, DoesNotGetIncludedTopDecls) { EXPECT_THAT(AST.getLocalTopLevelDecls(), ElementsAre(DeclNamed("main"))); } -TEST(ClangdUnitTest, DoesNotGetImplicitTemplateTopDecls) { +TEST(ParsedASTTest, DoesNotGetImplicitTemplateTopDecls) { TestTU TU; TU.Code = R"cpp( template @@ -112,7 +117,7 @@ TEST(ClangdUnitTest, DoesNotGetImplicitTemplateTopDecls) { ElementsAre(DeclNamed("f"), DeclNamed("s"))); } -TEST(ClangdUnitTest, +TEST(ParsedASTTest, GetsExplicitInstantiationAndSpecializationTemplateTopDecls) { TestTU TU; TU.Code = R"cpp( @@ -156,7 +161,7 @@ TEST(ClangdUnitTest, AllOf(DeclNamed("foo"), WithTemplateArgs(""))})); } -TEST(ClangdUnitTest, TokensAfterPreamble) { +TEST(ParsedASTTest, TokensAfterPreamble) { TestTU TU; TU.AdditionalFiles["foo.h"] = R"( int foo(); @@ -187,8 +192,7 @@ TEST(ClangdUnitTest, TokensAfterPreamble) { EXPECT_EQ(Spelled.back().text(SM), "last_token"); } - -TEST(ClangdUnitTest, NoCrashOnTokensWithTidyCheck) { +TEST(ParsedASTTest, NoCrashOnTokensWithTidyCheck) { TestTU TU; // this check runs the preprocessor, we need to make sure it does not break // our recording logic. @@ -208,7 +212,7 @@ TEST(ClangdUnitTest, NoCrashOnTokensWithTidyCheck) { EXPECT_EQ(T.expandedTokens().drop_back().back().text(SM), "}"); } -TEST(ClangdUnitTest, CanBuildInvocationWithUnknownArgs) { +TEST(ParsedASTTest, CanBuildInvocationWithUnknownArgs) { // Unknown flags should not prevent a build of compiler invocation. ParseInputs Inputs; Inputs.FS = buildTestFS({{testPath("foo.cpp"), "void test() {}"}}); @@ -223,7 +227,7 @@ TEST(ClangdUnitTest, CanBuildInvocationWithUnknownArgs) { EXPECT_NE(buildCompilerInvocation(Inputs, IgnoreDiags), nullptr); } -TEST(ClangdUnitTest, CollectsMainFileMacroExpansions) { +TEST(ParsedASTTest, CollectsMainFileMacroExpansions) { Annotations TestCase(R"cpp( #define MACRO_ARGS(X, Y) X Y ^ID(int A); diff --git a/clang-tools-extra/clangd/unittests/SourceCodeTests.cpp b/clang-tools-extra/clangd/unittests/SourceCodeTests.cpp index d94d1c9f52b4..cd9ccf0481a7 100644 --- a/clang-tools-extra/clangd/unittests/SourceCodeTests.cpp +++ b/clang-tools-extra/clangd/unittests/SourceCodeTests.cpp @@ -312,7 +312,7 @@ TEST(SourceCodeTests, SourceLocationInMainFile) { } } -TEST(ClangdUnitTest, GetBeginningOfIdentifier) { +TEST(SourceCodeTests, GetBeginningOfIdentifier) { std::string Preamble = R"cpp( struct Bar { int func(); }; #define MACRO(X) void f() { X; } diff --git a/clang-tools-extra/clangd/unittests/SymbolInfoTests.cpp b/clang-tools-extra/clangd/unittests/SymbolInfoTests.cpp index d8d404326ca6..1d009f6339bc 100644 --- a/clang-tools-extra/clangd/unittests/SymbolInfoTests.cpp +++ b/clang-tools-extra/clangd/unittests/SymbolInfoTests.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// #include "Annotations.h" -#include "ClangdUnit.h" #include "Compiler.h" #include "Matchers.h" +#include "ParsedAST.h" #include "SyncAPI.h" #include "TestFS.h" #include "TestTU.h" diff --git a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp index 5b7f8a707658..5dbfca5f2462 100644 --- a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp +++ b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "Annotations.h" -#include "ClangdUnit.h" #include "Context.h" #include "Diagnostics.h" #include "Matchers.h" +#include "ParsedAST.h" #include "Path.h" #include "Preamble.h" #include "TUScheduler.h" diff --git a/clang-tools-extra/clangd/unittests/TestTU.h b/clang-tools-extra/clangd/unittests/TestTU.h index e1f9bf855bec..403f2a8adeb6 100644 --- a/clang-tools-extra/clangd/unittests/TestTU.h +++ b/clang-tools-extra/clangd/unittests/TestTU.h @@ -17,7 +17,7 @@ #ifndef LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_TESTTU_H #define LLVM_CLANG_TOOLS_EXTRA_UNITTESTS_CLANGD_TESTTU_H -#include "ClangdUnit.h" +#include "ParsedAST.h" #include "Path.h" #include "index/Index.h" #include "llvm/ADT/StringMap.h" diff --git a/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp b/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp index cebfa8dfbeb9..bc9a1c6f0427 100644 --- a/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp +++ b/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// #include "Annotations.h" -#include "ClangdUnit.h" #include "Compiler.h" #include "Matchers.h" +#include "ParsedAST.h" #include "SyncAPI.h" #include "TestFS.h" #include "TestTU.h" diff --git a/clang-tools-extra/clangd/unittests/XRefsTests.cpp b/clang-tools-extra/clangd/unittests/XRefsTests.cpp index 877bfaa5c1d4..e4a4a6f82587 100644 --- a/clang-tools-extra/clangd/unittests/XRefsTests.cpp +++ b/clang-tools-extra/clangd/unittests/XRefsTests.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// #include "Annotations.h" -#include "ClangdUnit.h" #include "Compiler.h" #include "Matchers.h" +#include "ParsedAST.h" #include "Protocol.h" #include "SyncAPI.h" #include "TestFS.h"