Skip to content

[clang-format] Improve annotating templates #165631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[clang-format] Improve annotating templates #165631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions clang/lib/Format/TokenAnnotator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,14 @@ class AnnotatingParser {
if (!CurrentToken)
return false;

auto *Left = CurrentToken->Previous; // The '<'.
auto *const Left = CurrentToken->Previous; // The '<'.
if (!Left)
return false;

if (NonTemplateLess.count(Left) > 0)
return false;

const auto *BeforeLess = Left->Previous;
const auto *const BeforeLess = Left->Previous;

if (BeforeLess) {
if (BeforeLess->Tok.isLiteral())
Expand Down Expand Up @@ -206,8 +206,18 @@ class AnnotatingParser {
(!Next || Next->isNoneOf(tok::l_paren, tok::l_brace))) {
return false;
}
if (!MaybeAngles)
return false;
if (!MaybeAngles) {
const bool IsCommonCppTemplate =
(BeforeLess && BeforeLess->is(tok::identifier) &&
(BeforeLess->TokenText.ends_with("_t") ||
BeforeLess->TokenText.ends_with("_v"))) ||
(Next &&
Next->startsSequence(tok::coloncolon, tok::identifier) &&
(Next->Next->TokenText == "type" ||
Next->Next->TokenText == "value"));
if (!IsCommonCppTemplate)
return false;
}
}
Left->MatchingParen = CurrentToken;
CurrentToken->MatchingParen = Left;
Expand Down
24 changes: 24 additions & 0 deletions clang/unittests/Format/TokenAnnotatorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,30 @@ TEST_F(TokenAnnotatorTest, UnderstandsTemplateTemplateParameters) {
EXPECT_TOKEN(Tokens[23], tok::identifier, TT_ClassHeadName);
}

TEST_F(TokenAnnotatorTest, UnderstandsCommonCppTemplates) {
auto Tokens =
annotate("static_assert(std::conditional_t<A || B, C, D>::value);");
ASSERT_EQ(Tokens.size(), 19u) << Tokens;
EXPECT_TOKEN(Tokens[5], tok::less, TT_TemplateOpener);
EXPECT_TOKEN(Tokens[13], tok::greater, TT_TemplateCloser);

Tokens =
annotate("static_assert(std::conditional<A || B, C, D>::type::value);");
ASSERT_EQ(Tokens.size(), 21u) << Tokens;
EXPECT_TOKEN(Tokens[5], tok::less, TT_TemplateOpener);
EXPECT_TOKEN(Tokens[13], tok::greater, TT_TemplateCloser);

Tokens = annotate("static_assert(fancy_v<A || B>);");
ASSERT_EQ(Tokens.size(), 11u) << Tokens;
EXPECT_TOKEN(Tokens[3], tok::less, TT_TemplateOpener);
EXPECT_TOKEN(Tokens[7], tok::greater, TT_TemplateCloser);

Tokens = annotate("static_assert(fancy<A || B>::value);");
ASSERT_EQ(Tokens.size(), 13u) << Tokens;
EXPECT_TOKEN(Tokens[3], tok::less, TT_TemplateOpener);
EXPECT_TOKEN(Tokens[7], tok::greater, TT_TemplateCloser);
}

TEST_F(TokenAnnotatorTest, UnderstandsWhitespaceSensitiveMacros) {
FormatStyle Style = getLLVMStyle();
Style.WhitespaceSensitiveMacros.push_back("FOO");
Expand Down