diff options
| -rw-r--r-- | clang/lib/Format/NamespaceEndCommentsFixer.cpp | 16 | ||||
| -rw-r--r-- | clang/lib/Format/UnwrappedLineParser.cpp | 9 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 15 | ||||
| -rw-r--r-- | clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp | 41 |
4 files changed, 76 insertions, 5 deletions
diff --git a/clang/lib/Format/NamespaceEndCommentsFixer.cpp b/clang/lib/Format/NamespaceEndCommentsFixer.cpp index d04fc8f115f..98901cff268 100644 --- a/clang/lib/Format/NamespaceEndCommentsFixer.cpp +++ b/clang/lib/Format/NamespaceEndCommentsFixer.cpp @@ -36,7 +36,7 @@ std::string computeName(const FormatToken *NamespaceTok) { const FormatToken *Tok = NamespaceTok->getNextNonComment(); if (NamespaceTok->is(TT_NamespaceMacro)) { // Collects all the non-comment tokens between opening parenthesis - // and closing parenthesis or comma + // and closing parenthesis or comma. assert(Tok && Tok->is(tok::l_paren) && "expected an opening parenthesis"); Tok = Tok->getNextNonComment(); while (Tok && !Tok->isOneOf(tok::r_paren, tok::comma)) { @@ -44,9 +44,21 @@ std::string computeName(const FormatToken *NamespaceTok) { Tok = Tok->getNextNonComment(); } } else { - // Collects all the non-comment tokens between 'namespace' and '{'. + // For `namespace [[foo]] A::B::inline C {` or + // `namespace MACRO1 MACRO2 A::B::inline C {`, returns "A::B::inline C". + // Peek for the first '::' (or '{') and then return all tokens from one + // token before that up until the '{'. + const FormatToken *FirstNSTok = Tok; + while (Tok && !Tok->is(tok::l_brace) && !Tok->is(tok::coloncolon)) { + FirstNSTok = Tok; + Tok = Tok->getNextNonComment(); + } + + Tok = FirstNSTok; while (Tok && !Tok->is(tok::l_brace)) { name += Tok->TokenText; + if (Tok->is(tok::kw_inline)) + name += " "; Tok = Tok->getNextNonComment(); } } diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index b9da698a931..33d0563d942 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -1873,8 +1873,13 @@ void UnwrappedLineParser::parseNamespace() { if (InitialToken.is(TT_NamespaceMacro)) { parseParens(); } else { - while (FormatTok->isOneOf(tok::identifier, tok::coloncolon)) - nextToken(); + while (FormatTok->isOneOf(tok::identifier, tok::coloncolon, tok::kw_inline, + tok::l_square)) { + if (FormatTok->is(tok::l_square)) + parseSquare(); + else + nextToken(); + } } if (FormatTok->Tok.is(tok::l_brace)) { if (ShouldBreakBeforeBrace(Style, InitialToken)) diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 463b9213a04..614e81e333a 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -1782,6 +1782,21 @@ TEST_F(FormatTest, FormatsNamespaces) { "void f() { f(); }\n" "}", LLVMWithNoNamespaceFix); + verifyFormat("namespace N::inline D {\n" + "class A {};\n" + "void f() { f(); }\n" + "}", + LLVMWithNoNamespaceFix); + verifyFormat("namespace N::inline D::E {\n" + "class A {};\n" + "void f() { f(); }\n" + "}", + LLVMWithNoNamespaceFix); + verifyFormat("namespace [[deprecated(\"foo[bar\")]] some_namespace {\n" + "class A {};\n" + "void f() { f(); }\n" + "}", + LLVMWithNoNamespaceFix); verifyFormat("/* something */ namespace some_namespace {\n" "class A {};\n" "void f() { f(); }\n" diff --git a/clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp b/clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp index 44cb4ef653a..ad77c747a59 100644 --- a/clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp +++ b/clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp @@ -77,6 +77,44 @@ TEST_F(NamespaceEndCommentsFixerTest, AddsEndComment) { "int i;\n" "int j;\n" "}")); + + EXPECT_EQ("namespace [[deprecated(\"foo\")]] A::B {\n" + "int i;\n" + "int j;\n" + "}// namespace A::B", + fixNamespaceEndComments("namespace [[deprecated(\"foo\")]] A::B {\n" + "int i;\n" + "int j;\n" + "}")); + + EXPECT_EQ("namespace [[deprecated(\"foo\")]] A::inline B::inline C {\n" + "int i;\n" + "int j;\n" + "}// namespace A::inline B::inline C", + fixNamespaceEndComments( + "namespace [[deprecated(\"foo\")]] A::inline B::inline C {\n" + "int i;\n" + "int j;\n" + "}")); + + EXPECT_EQ("namespace DEPRECATED A::B {\n" + "int i;\n" + "int j;\n" + "}// namespace A::B", + fixNamespaceEndComments("namespace DEPRECATED A::B {\n" + "int i;\n" + "int j;\n" + "}")); + + EXPECT_EQ("inline namespace [[deprecated]] A {\n" + "int i;\n" + "int j;\n" + "}// namespace A", + fixNamespaceEndComments("inline namespace [[deprecated]] A {\n" + "int i;\n" + "int j;\n" + "}")); + EXPECT_EQ("namespace ::A {\n" "int i;\n" "int j;\n" @@ -410,7 +448,8 @@ TEST_F(NamespaceEndCommentsFixerTest, DoesNotAddCommentAfterUnaffectedRBrace) { /*Ranges=*/{1, tooling::Range(16, 3)})); } -TEST_F(NamespaceEndCommentsFixerTest, DoesNotAddCommentAfterRBraceInPPDirective) { +TEST_F(NamespaceEndCommentsFixerTest, + DoesNotAddCommentAfterRBraceInPPDirective) { EXPECT_EQ("#define SAD \\\n" "namespace A { \\\n" "int i; \\\n" |
