diff options
Diffstat (limited to 'clang-tools-extra/clangd/unittests/ParsedASTTests.cpp')
| -rw-r--r-- | clang-tools-extra/clangd/unittests/ParsedASTTests.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/clang-tools-extra/clangd/unittests/ParsedASTTests.cpp b/clang-tools-extra/clangd/unittests/ParsedASTTests.cpp index 65020bf2a95..53e2f4b68e1 100644 --- a/clang-tools-extra/clangd/unittests/ParsedASTTests.cpp +++ b/clang-tools-extra/clangd/unittests/ParsedASTTests.cpp @@ -229,8 +229,8 @@ TEST(ParsedASTTest, CanBuildInvocationWithUnknownArgs) { TEST(ParsedASTTest, CollectsMainFileMacroExpansions) { Annotations TestCase(R"cpp( - #define MACRO_ARGS(X, Y) X Y - // - premable ends, macros inside preamble are not considered in main file. + #define ^MACRO_ARGS(X, Y) X Y + // - preamble ends ^ID(int A); // Macro arguments included. ^MACRO_ARGS(^MACRO_ARGS(^MACRO_EXP(int), A), ^ID(= 2)); @@ -270,12 +270,11 @@ TEST(ParsedASTTest, CollectsMainFileMacroExpansions) { int D = DEF; )cpp"; ParsedAST AST = TU.build(); - const std::vector<SourceLocation> &MacroExpansionLocations = AST.getMacros(); std::vector<Position> MacroExpansionPositions; - for (const auto &L : MacroExpansionLocations) - MacroExpansionPositions.push_back( - sourceLocToPosition(AST.getSourceManager(), L)); - EXPECT_EQ(MacroExpansionPositions, TestCase.points()); + for (const auto &R : AST.getMacros().Ranges) + MacroExpansionPositions.push_back(R.start); + EXPECT_THAT(MacroExpansionPositions, + testing::UnorderedElementsAreArray(TestCase.points())); } } // namespace |
