This is an archive of the discontinued LLVM Phabricator instance.

Differential D156065

[clang-format] Insert namespace comments with leading spaces
ClosedPublic

Authored by owenpan on Jul 23 2023, 1:57 PM.

Details

Reviewers
rymiel
HazardyKnusperkeks
MyDeveloperDay
Commits
rG2f6b2dafb783: [clang-format] Insert namespace comments with leading spaces
Summary

Insert missing namespace comments with SpacesBeforeTrailingComments leading spaces.

Fixes https://github.com/llvm/llvm-project/issues/64051.

Diff Detail

Event Timeline

owenpan created this revision.Jul 23 2023, 1:57 PM
Herald added projects: Restricted Project, Restricted Project, Restricted Project. · View Herald TranscriptJul 23 2023, 1:57 PM
Herald added reviewers: rymiel, HazardyKnusperkeks, MyDeveloperDay. · View Herald Transcript
Herald added a subscriber: cfe-commits. · View Herald Transcript
owenpan requested review of this revision.Jul 23 2023, 1:57 PM
owenpan mentioned this in D138263: [clang-format] Supress aligning of trailing namespace comments.
Harbormaster completed remote builds in B247524: Diff 543324.Jul 23 2023, 4:23 PM
HazardyKnusperkeks added inline comments.Jul 23 2023, 11:54 PM
clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp
29

I'd rather fix all the tests.

owenpan updated this revision to Diff 543415.Jul 24 2023, 1:51 AM

Fixed unit tests in NamespaceEndCommentsFixerTest.cpp.

owenpan marked an inline comment as done.Jul 24 2023, 1:52 AM
Harbormaster completed remote builds in B247590: Diff 543415.Jul 24 2023, 3:29 AM
HazardyKnusperkeks accepted this revision.Jul 24 2023, 3:46 AM
This revision is now accepted and ready to land.Jul 24 2023, 3:46 AM
MyDeveloperDay accepted this revision.Jul 24 2023, 4:41 AM
Closed by commit rG2f6b2dafb783: [clang-format] Insert namespace comments with leading spaces (authored by owenpan). · Explain WhyJul 24 2023, 9:23 AM
This revision was automatically updated to reflect the committed changes.
owenpan added a commit: rG2f6b2dafb783: [clang-format] Insert namespace comments with leading spaces.

Revision Contents

PathSize
clang/
lib/
Format/
8 lines
unittests/
Format/
10 lines
144 lines

Diff 543588

clang/lib/Format/NamespaceEndCommentsFixer.cpp

Show First 20 Lines • Show All 354 Lines • ▼ Show 20 Lines for (size_t I = 0, E = AnnotatedLines.size(); I != E; ++I) {
bool AddNewline = EndCommentNextTok && bool AddNewline = EndCommentNextTok &&
EndCommentNextTok->NewlinesBefore == 0 && EndCommentNextTok->NewlinesBefore == 0 &&
EndCommentNextTok->isNot(tok::eof); EndCommentNextTok->isNot(tok::eof);
const std::string EndCommentText = const std::string EndCommentText =
computeEndCommentText(NamespaceName, AddNewline, NamespaceTok, computeEndCommentText(NamespaceName, AddNewline, NamespaceTok,
Style.SpacesInLineCommentPrefix.Minimum); Style.SpacesInLineCommentPrefix.Minimum);
if (!hasEndComment(EndCommentPrevTok)) { if (!hasEndComment(EndCommentPrevTok)) {
bool isShort = I - StartLineIndex <= Style.ShortNamespaceLines + 1; bool isShort = I - StartLineIndex <= Style.ShortNamespaceLines + 1;
if (!isShort) if (!isShort) {
addEndComment(EndCommentPrevTok, EndCommentText, SourceMgr, &Fixes); addEndComment(EndCommentPrevTok,
std::string(Style.SpacesBeforeTrailingComments, ' ') +
EndCommentText,
SourceMgr, &Fixes);
}
} else if (!validEndComment(EndCommentPrevTok, NamespaceName, } else if (!validEndComment(EndCommentPrevTok, NamespaceName,
NamespaceTok)) { NamespaceTok)) {
updateEndComment(EndCommentPrevTok, EndCommentText, SourceMgr, &Fixes); updateEndComment(EndCommentPrevTok, EndCommentText, SourceMgr, &Fixes);
} }
StartLineIndex = SIZE_MAX; StartLineIndex = SIZE_MAX;
} }
return {Fixes, 0}; return {Fixes, 0};
} }
} // namespace format } // namespace format
} // namespace clang } // namespace clang

clang/unittests/Format/FormatTestComments.cpp

Show First 20 Lines • Show All 3,037 Lines • ▼ Show 20 Lines EXPECT_EQ("// do not touch\n"
"\n" "\n"
" // comment\n" " // comment\n"
"// comment\n" "// comment\n"
"\n" "\n"
"\n" "\n"
"// comment", "// comment",
Style)); Style));
verifyFormat("namespace ns {\n"
"int i;\n"
"int j;\n"
"} // namespace ns",
"namespace ns {\n"
"int i;\n"
"int j;\n"
"}",
Style);
// Allow to keep 2 empty lines // Allow to keep 2 empty lines
Style.MaxEmptyLinesToKeep = 2; Style.MaxEmptyLinesToKeep = 2;
EXPECT_EQ("// do not touch\n" EXPECT_EQ("// do not touch\n"
"int a; // any comments\n" "int a; // any comments\n"
"\n" "\n"
"\n" "\n"
" // comment\n" " // comment\n"
"// comment\n" "// comment\n"
▲ Show 20 Lines • Show All 1,247 Lines • Show Last 20 Lines

clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp

Show All 20 Lines
protected: protected:
std::string std::string
fixNamespaceEndComments(llvm::StringRef Code, fixNamespaceEndComments(llvm::StringRef Code,
const std::vector<tooling::Range> &Ranges, const std::vector<tooling::Range> &Ranges,
const FormatStyle &Style = getLLVMStyle()) { const FormatStyle &Style = getLLVMStyle()) {
LLVM_DEBUG(llvm::errs() << "---\n"); LLVM_DEBUG(llvm::errs() << "---\n");
LLVM_DEBUG(llvm::errs() << Code << "\n\n"); LLVM_DEBUG(llvm::errs() << Code << "\n\n");
tooling::Replacements Replaces = tooling::Replacements Replaces =
clang::format::fixNamespaceEndComments(Style, Code, Ranges, "<stdin>"); clang::format::fixNamespaceEndComments(Style, Code, Ranges, "<stdin>");
HazardyKnusperkeksUnsubmitted
Done
ReplyInline Actions

I'd rather fix all the tests.

HazardyKnusperkeks: I'd rather fix all the tests.
auto Result = applyAllReplacements(Code, Replaces); auto Result = applyAllReplacements(Code, Replaces);
EXPECT_TRUE(static_cast<bool>(Result)); EXPECT_TRUE(static_cast<bool>(Result));
LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
return *Result; return *Result;
} }
std::string std::string
fixNamespaceEndComments(llvm::StringRef Code, fixNamespaceEndComments(llvm::StringRef Code,
const FormatStyle &Style = getLLVMStyle()) { const FormatStyle &Style = getLLVMStyle()) {
return fixNamespaceEndComments( return fixNamespaceEndComments(
Code, Code,
/*Ranges=*/{1, tooling::Range(0, Code.size())}, Style); /*Ranges=*/{1, tooling::Range(0, Code.size())}, Style);
} }
}; };
TEST_F(NamespaceEndCommentsFixerTest, AddsEndComment) { TEST_F(NamespaceEndCommentsFixerTest, AddsEndComment) {
EXPECT_EQ("namespace {\n" EXPECT_EQ("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace", "} // namespace",
fixNamespaceEndComments("namespace {\n" fixNamespaceEndComments("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("namespace {\n" EXPECT_EQ("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace\n", "} // namespace\n",
fixNamespaceEndComments("namespace {\n" fixNamespaceEndComments("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}\n")); "}\n"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("#define M(x) x##x\n" EXPECT_EQ("#define M(x) x##x\n"
"namespace M(x) {\n" "namespace M(x) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace M(x)", "} // namespace M(x)",
fixNamespaceEndComments("#define M(x) x##x\n" fixNamespaceEndComments("#define M(x) x##x\n"
"namespace M(x) {\n" "namespace M(x) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("#define M(x) x##x\n" EXPECT_EQ("#define M(x) x##x\n"
"namespace A::M(x) {\n" "namespace A::M(x) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A::M(x)", "} // namespace A::M(x)",
fixNamespaceEndComments("#define M(x) x##x\n" fixNamespaceEndComments("#define M(x) x##x\n"
"namespace A::M(x) {\n" "namespace A::M(x) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("#define M(x) x##x\n" EXPECT_EQ("#define M(x) x##x\n"
"namespace M(x)::A {\n" "namespace M(x)::A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace M(x)::A", "} // namespace M(x)::A",
fixNamespaceEndComments("#define M(x) x##x\n" fixNamespaceEndComments("#define M(x) x##x\n"
"namespace M(x)::A {\n" "namespace M(x)::A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("#define M(x) x##x\n" EXPECT_EQ("#define M(x) x##x\n"
"namespace A::inline M(x)::B {\n" "namespace A::inline M(x)::B {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A::inline M(x)::B", "} // namespace A::inline M(x)::B",
fixNamespaceEndComments("#define M(x) x##x\n" fixNamespaceEndComments("#define M(x) x##x\n"
"namespace A::inline M(x)::B {\n" "namespace A::inline M(x)::B {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("#define M(x) x##x\n" EXPECT_EQ("#define M(x) x##x\n"
"namespace [[deprecated(\"foo\")]] A::inline M(x)::A {\n" "namespace [[deprecated(\"foo\")]] A::inline M(x)::A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A::inline M(x)::A", "} // namespace A::inline M(x)::A",
fixNamespaceEndComments( fixNamespaceEndComments(
"#define M(x) x##x\n" "#define M(x) x##x\n"
"namespace [[deprecated(\"foo\")]] A::inline M(x)::A {\n" "namespace [[deprecated(\"foo\")]] A::inline M(x)::A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ( EXPECT_EQ(
"namespace /* comment */ [[deprecated(\"foo\")]] /* comment */ A {\n" "namespace /* comment */ [[deprecated(\"foo\")]] /* comment */ A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments( fixNamespaceEndComments(
"namespace /* comment */ [[deprecated(\"foo\")]] /* comment */ A {\n" "namespace /* comment */ [[deprecated(\"foo\")]] /* comment */ A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("namespace /* comment */ [[deprecated(\"foo\")]] A {\n" EXPECT_EQ("namespace /* comment */ [[deprecated(\"foo\")]] A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments( fixNamespaceEndComments(
"namespace /* comment */ [[deprecated(\"foo\")]] A {\n" "namespace /* comment */ [[deprecated(\"foo\")]] A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ( EXPECT_EQ(
"#define M(x) x##x\n" "#define M(x) x##x\n"
"namespace /* comment */ [[deprecated(\"foo\")]] /* comment */ M(x) {\n" "namespace /* comment */ [[deprecated(\"foo\")]] /* comment */ M(x) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace M(x)", "} // namespace M(x)",
fixNamespaceEndComments("#define M(x) x##x\n" fixNamespaceEndComments("#define M(x) x##x\n"
"namespace /* comment */ " "namespace /* comment */ "
"[[deprecated(\"foo\")]] /* comment */ M(x) {\n" "[[deprecated(\"foo\")]] /* comment */ M(x) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("#define M(x) x##x\n" EXPECT_EQ("#define M(x) x##x\n"
"namespace /* comment */ [[deprecated(\"foo\")]] /* comment */ " "namespace /* comment */ [[deprecated(\"foo\")]] /* comment */ "
"A::M(x) {\n" "A::M(x) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A::M(x)", "} // namespace A::M(x)",
fixNamespaceEndComments( fixNamespaceEndComments(
"#define M(x) x##x\n" "#define M(x) x##x\n"
"namespace /* comment */ " "namespace /* comment */ "
"[[deprecated(\"foo\")]] /* comment */ A::M(x) {\n" "[[deprecated(\"foo\")]] /* comment */ A::M(x) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("#define M(x) x##x\n" EXPECT_EQ("#define M(x) x##x\n"
"namespace /* comment */ [[deprecated(\"foo\")]] /* comment */ " "namespace /* comment */ [[deprecated(\"foo\")]] /* comment */ "
"M(x) /* comment */ {\n" "M(x) /* comment */ {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace M(x)", "} // namespace M(x)",
fixNamespaceEndComments( fixNamespaceEndComments(
"#define M(x) x##x\n" "#define M(x) x##x\n"
"namespace /* comment */ [[deprecated(\"foo\")]] /* comment " "namespace /* comment */ [[deprecated(\"foo\")]] /* comment "
"*/ M(x) /* comment */ {\n" "*/ M(x) /* comment */ {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("#define M(x) x##x\n" EXPECT_EQ("#define M(x) x##x\n"
"namespace /* comment */ [[deprecated(\"foo\")]] /* comment */ " "namespace /* comment */ [[deprecated(\"foo\")]] /* comment */ "
"A::M(x) /* comment */ {\n" "A::M(x) /* comment */ {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A::M(x)", "} // namespace A::M(x)",
fixNamespaceEndComments( fixNamespaceEndComments(
"#define M(x) x##x\n" "#define M(x) x##x\n"
"namespace /* comment */ [[deprecated(\"foo\")]] /* comment " "namespace /* comment */ [[deprecated(\"foo\")]] /* comment "
"*/ A::M(x) /* comment */ {\n" "*/ A::M(x) /* comment */ {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("#define M(x) x##x\n" EXPECT_EQ("#define M(x) x##x\n"
"namespace A M(x) {\n" "namespace A M(x) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A M(x)", "} // namespace A M(x)",
fixNamespaceEndComments("#define M(x) x##x\n" fixNamespaceEndComments("#define M(x) x##x\n"
"namespace A M(x) {\n" "namespace A M(x) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ( EXPECT_EQ(
"#define B __attribute__((availability(macos, introduced=10.15)))\n" "#define B __attribute__((availability(macos, introduced=10.15)))\n"
"namespace A B {\n" "namespace A B {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A B", "} // namespace A B",
fixNamespaceEndComments( fixNamespaceEndComments(
"#define B __attribute__((availability(macos, introduced=10.15)))\n" "#define B __attribute__((availability(macos, introduced=10.15)))\n"
"namespace A B {\n" "namespace A B {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("#define M(x) x##x\n" EXPECT_EQ("#define M(x) x##x\n"
"namespace A::B M(x) {\n" "namespace A::B M(x) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A::B", "} // namespace A::B",
fixNamespaceEndComments("#define M(x) x##x\n" fixNamespaceEndComments("#define M(x) x##x\n"
"namespace A::B M(x) {\n" "namespace A::B M(x) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ( EXPECT_EQ(
"namespace A __attribute__((availability(macos, introduced=10.15))) {\n" "namespace A __attribute__((availability(macos, introduced=10.15))) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments( fixNamespaceEndComments(
"namespace A __attribute__((availability(macos, introduced=10.15))) " "namespace A __attribute__((availability(macos, introduced=10.15))) "
"{\n" "{\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("inline namespace A {\n" EXPECT_EQ("inline namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments("inline namespace A {\n" fixNamespaceEndComments("inline namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("namespace [[deprecated(\"foo\")]] A::B {\n" EXPECT_EQ("namespace [[deprecated(\"foo\")]] A::B {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A::B", "} // namespace A::B",
fixNamespaceEndComments("namespace [[deprecated(\"foo\")]] A::B {\n" fixNamespaceEndComments("namespace [[deprecated(\"foo\")]] A::B {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("namespace [[deprecated(\"foo\")]] A::inline B::inline C {\n" EXPECT_EQ("namespace [[deprecated(\"foo\")]] A::inline B::inline C {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A::inline B::inline C", "} // namespace A::inline B::inline C",
fixNamespaceEndComments( fixNamespaceEndComments(
"namespace [[deprecated(\"foo\")]] A::inline B::inline C {\n" "namespace [[deprecated(\"foo\")]] A::inline B::inline C {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("namespace DEPRECATED A::B {\n" EXPECT_EQ("namespace DEPRECATED A::B {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A::B", "} // namespace A::B",
fixNamespaceEndComments("namespace DEPRECATED A::B {\n" fixNamespaceEndComments("namespace DEPRECATED A::B {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("inline namespace [[deprecated]] A {\n" EXPECT_EQ("inline namespace [[deprecated]] A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments("inline namespace [[deprecated]] A {\n" fixNamespaceEndComments("inline namespace [[deprecated]] A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("namespace ::A {\n" EXPECT_EQ("namespace ::A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace ::A", "} // namespace ::A",
fixNamespaceEndComments("namespace ::A {\n" fixNamespaceEndComments("namespace ::A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("namespace ::A::B {\n" EXPECT_EQ("namespace ::A::B {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace ::A::B", "} // namespace ::A::B",
fixNamespaceEndComments("namespace ::A::B {\n" fixNamespaceEndComments("namespace ::A::B {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("namespace /**/::/**/A/**/::/**/B/**/ {\n" EXPECT_EQ("namespace /**/::/**/A/**/::/**/B/**/ {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace ::A::B", "} // namespace ::A::B",
fixNamespaceEndComments("namespace /**/::/**/A/**/::/**/B/**/ {\n" fixNamespaceEndComments("namespace /**/::/**/A/**/::/**/B/**/ {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"namespace B {\n" "namespace B {\n"
"int i;\n" "int i;\n"
"}\n" "}\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"namespace B {\n" "namespace B {\n"
"int i;\n" "int i;\n"
"}\n" "}\n"
"}")); "}"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"namespace B {\n" "namespace B {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace B\n" "} // namespace B\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"namespace B {\n" "namespace B {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}\n" "}\n"
"}")); "}"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"int a;\n" "int a;\n"
"int b;\n" "int b;\n"
"}// namespace A\n" "} // namespace A\n"
"namespace B {\n" "namespace B {\n"
"int b;\n" "int b;\n"
"int a;\n" "int a;\n"
"}// namespace B", "} // namespace B",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"int a;\n" "int a;\n"
"int b;\n" "int b;\n"
"}\n" "}\n"
"namespace B {\n" "namespace B {\n"
"int b;\n" "int b;\n"
"int a;\n" "int a;\n"
"}")); "}"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"int a1;\n" "int a1;\n"
"int a2;\n" "int a2;\n"
"}// namespace A\n" "} // namespace A\n"
"namespace A {\n" "namespace A {\n"
"int a2;\n" "int a2;\n"
"int a1;\n" "int a1;\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"int a1;\n" "int a1;\n"
"int a2;\n" "int a2;\n"
"}\n" "}\n"
"namespace A {\n" "namespace A {\n"
"int a2;\n" "int a2;\n"
"int a1;\n" "int a1;\n"
"}")); "}"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"int a;\n" "int a;\n"
"int b;\n" "int b;\n"
"}// namespace A\n" "} // namespace A\n"
"// comment about b\n" "// comment about b\n"
"int b;", "int b;",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"int a;\n" "int a;\n"
"int b;\n" "int b;\n"
"}\n" "}\n"
"// comment about b\n" "// comment about b\n"
"int b;")); "int b;"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"namespace B {\n" "namespace B {\n"
"namespace C {\n" "namespace C {\n"
"namespace D {\n" "namespace D {\n"
"}\n" "}\n"
"}// namespace C\n" "} // namespace C\n"
"}// namespace B\n" "} // namespace B\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"namespace B {\n" "namespace B {\n"
"namespace C {\n" "namespace C {\n"
"namespace D {\n" "namespace D {\n"
"}\n" "}\n"
"}\n" "}\n"
"}\n" "}\n"
"}")); "}"));
// Add comment for namespaces which will be 'compacted' // Add comment for namespaces which will be 'compacted'
FormatStyle CompactNamespacesStyle = getLLVMStyle(); FormatStyle CompactNamespacesStyle = getLLVMStyle();
CompactNamespacesStyle.CompactNamespaces = true; CompactNamespacesStyle.CompactNamespaces = true;
EXPECT_EQ("namespace out { namespace in {\n" EXPECT_EQ("namespace out { namespace in {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}}// namespace out::in", "}} // namespace out::in",
fixNamespaceEndComments("namespace out { namespace in {\n" fixNamespaceEndComments("namespace out { namespace in {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}}", "}}",
CompactNamespacesStyle)); CompactNamespacesStyle));
EXPECT_EQ("namespace out {\n" EXPECT_EQ("namespace out {\n"
"namespace in {\n" "namespace in {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}\n" "}\n"
"}// namespace out::in", "} // namespace out::in",
fixNamespaceEndComments("namespace out {\n" fixNamespaceEndComments("namespace out {\n"
"namespace in {\n" "namespace in {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}\n" "}\n"
"}", "}",
CompactNamespacesStyle)); CompactNamespacesStyle));
EXPECT_EQ("namespace out { namespace in {\n" EXPECT_EQ("namespace out { namespace in {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"};}// namespace out::in", "};} // namespace out::in",
fixNamespaceEndComments("namespace out { namespace in {\n" fixNamespaceEndComments("namespace out { namespace in {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"};}", "};}",
CompactNamespacesStyle)); CompactNamespacesStyle));
EXPECT_EQ("namespace out { namespace {\n" EXPECT_EQ("namespace out { namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}}// namespace out", "}} // namespace out",
fixNamespaceEndComments("namespace out { namespace {\n" fixNamespaceEndComments("namespace out { namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}}", "}}",
CompactNamespacesStyle)); CompactNamespacesStyle));
// Adds an end comment after a semicolon. // Adds an end comment after a semicolon.
EXPECT_EQ("namespace {\n" EXPECT_EQ("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"};// namespace", "}; // namespace",
fixNamespaceEndComments("namespace {\n" fixNamespaceEndComments("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"};")); "};"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"};// namespace A", "}; // namespace A",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"};")); "};"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"};// namespace A\n" "}; // namespace A\n"
"// unrelated", "// unrelated",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"};\n" "};\n"
"// unrelated")); "// unrelated"));
} }
TEST_F(NamespaceEndCommentsFixerTest, WorksForObjCpp) { TEST_F(NamespaceEndCommentsFixerTest, WorksForObjCpp) {
FormatStyle ObjCppStyle = getLLVMStyle(); FormatStyle ObjCppStyle = getLLVMStyle();
ObjCppStyle.Language = FormatStyle::LK_ObjC; ObjCppStyle.Language = FormatStyle::LK_ObjC;
EXPECT_EQ("namespace {\n" EXPECT_EQ("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace", "} // namespace",
fixNamespaceEndComments("namespace {\n" fixNamespaceEndComments("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}", "}",
ObjCppStyle)); ObjCppStyle));
} }
TEST_F(NamespaceEndCommentsFixerTest, AddsMacroEndComment) { TEST_F(NamespaceEndCommentsFixerTest, AddsMacroEndComment) {
FormatStyle Style = getLLVMStyle(); FormatStyle Style = getLLVMStyle();
Style.NamespaceMacros.push_back("TESTSUITE"); Style.NamespaceMacros.push_back("TESTSUITE");
EXPECT_EQ("TESTSUITE() {\n" EXPECT_EQ("TESTSUITE() {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// TESTSUITE()", "} // TESTSUITE()",
fixNamespaceEndComments("TESTSUITE() {\n" fixNamespaceEndComments("TESTSUITE() {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}", "}",
Style)); Style));
EXPECT_EQ("TESTSUITE(A) {\n" EXPECT_EQ("TESTSUITE(A) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// TESTSUITE(A)", "} // TESTSUITE(A)",
fixNamespaceEndComments("TESTSUITE(A) {\n" fixNamespaceEndComments("TESTSUITE(A) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}", "}",
Style)); Style));
EXPECT_EQ("inline TESTSUITE(A) {\n" EXPECT_EQ("inline TESTSUITE(A) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// TESTSUITE(A)", "} // TESTSUITE(A)",
fixNamespaceEndComments("inline TESTSUITE(A) {\n" fixNamespaceEndComments("inline TESTSUITE(A) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}", "}",
Style)); Style));
EXPECT_EQ("TESTSUITE(::A) {\n" EXPECT_EQ("TESTSUITE(::A) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// TESTSUITE(::A)", "} // TESTSUITE(::A)",
fixNamespaceEndComments("TESTSUITE(::A) {\n" fixNamespaceEndComments("TESTSUITE(::A) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}", "}",
Style)); Style));
EXPECT_EQ("TESTSUITE(::A::B) {\n" EXPECT_EQ("TESTSUITE(::A::B) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// TESTSUITE(::A::B)", "} // TESTSUITE(::A::B)",
fixNamespaceEndComments("TESTSUITE(::A::B) {\n" fixNamespaceEndComments("TESTSUITE(::A::B) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}", "}",
Style)); Style));
EXPECT_EQ("TESTSUITE(/**/::/**/A/**/::/**/B/**/) {\n" EXPECT_EQ("TESTSUITE(/**/::/**/A/**/::/**/B/**/) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// TESTSUITE(::A::B)", "} // TESTSUITE(::A::B)",
fixNamespaceEndComments("TESTSUITE(/**/::/**/A/**/::/**/B/**/) {\n" fixNamespaceEndComments("TESTSUITE(/**/::/**/A/**/::/**/B/**/) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}", "}",
Style)); Style));
EXPECT_EQ("TESTSUITE(A, B) {\n" EXPECT_EQ("TESTSUITE(A, B) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// TESTSUITE(A)", "} // TESTSUITE(A)",
fixNamespaceEndComments("TESTSUITE(A, B) {\n" fixNamespaceEndComments("TESTSUITE(A, B) {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}", "}",
Style)); Style));
EXPECT_EQ("TESTSUITE(\"Test1\") {\n" EXPECT_EQ("TESTSUITE(\"Test1\") {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// TESTSUITE(\"Test1\")", "} // TESTSUITE(\"Test1\")",
fixNamespaceEndComments("TESTSUITE(\"Test1\") {\n" fixNamespaceEndComments("TESTSUITE(\"Test1\") {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}", "}",
Style)); Style));
} }
TEST_F(NamespaceEndCommentsFixerTest, AddsNewlineIfNeeded) { TEST_F(NamespaceEndCommentsFixerTest, AddsNewlineIfNeeded) {
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A\n" "} // namespace A\n"
" int k;", " int k;",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"} int k;")); "} int k;"));
EXPECT_EQ("namespace {\n" EXPECT_EQ("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace\n" "} // namespace\n"
" int k;", " int k;",
fixNamespaceEndComments("namespace {\n" fixNamespaceEndComments("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"} int k;")); "} int k;"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A\n" "} // namespace A\n"
" namespace B {\n" " namespace B {\n"
"int j;\n" "int j;\n"
"int k;\n" "int k;\n"
"}// namespace B", "} // namespace B",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"} namespace B {\n" "} namespace B {\n"
"int j;\n" "int j;\n"
"int k;\n" "int k;\n"
"}")); "}"));
EXPECT_EQ("namespace {\n" EXPECT_EQ("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"};// namespace\n" "}; // namespace\n"
"int k;", "int k;",
fixNamespaceEndComments("namespace {\n" fixNamespaceEndComments("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"};int k;")); "};int k;"));
EXPECT_EQ("namespace {\n" EXPECT_EQ("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"};// namespace\n" "}; // namespace\n"
";", ";",
fixNamespaceEndComments("namespace {\n" fixNamespaceEndComments("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"};;")); "};;"));
} }
TEST_F(NamespaceEndCommentsFixerTest, DoesNotAddEndCommentForShortNamespace) { TEST_F(NamespaceEndCommentsFixerTest, DoesNotAddEndCommentForShortNamespace) {
▲ Show 20 Lines • Show All 399 Lines • ▼ Show 20 Lines
} }
TEST_F(NamespaceEndCommentsFixerTest, AddsEndCommentForNamespacesAroundMacros) { TEST_F(NamespaceEndCommentsFixerTest, AddsEndCommentForNamespacesAroundMacros) {
// Conditional blocks around are fine // Conditional blocks around are fine
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"#if 1\n" "#if 1\n"
"int i;\n" "int i;\n"
"#endif\n" "#endif\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"#if 1\n" "#if 1\n"
"int i;\n" "int i;\n"
"#endif\n" "#endif\n"
"}")); "}"));
EXPECT_EQ("#if 1\n" EXPECT_EQ("#if 1\n"
"#endif\n" "#endif\n"
"namespace A {\n" "namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments("#if 1\n" fixNamespaceEndComments("#if 1\n"
"#endif\n" "#endif\n"
"namespace A {\n" "namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A\n" "} // namespace A\n"
"#if 1\n" "#if 1\n"
"#endif", "#endif",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}\n" "}\n"
"#if 1\n" "#if 1\n"
"#endif")); "#endif"));
EXPECT_EQ("#if 1\n" EXPECT_EQ("#if 1\n"
"namespace A {\n" "namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A\n" "} // namespace A\n"
"#endif", "#endif",
fixNamespaceEndComments("#if 1\n" fixNamespaceEndComments("#if 1\n"
"namespace A {\n" "namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}\n" "}\n"
"#endif")); "#endif"));
// Macro definition has no impact // Macro definition has no impact
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"#define FOO\n" "#define FOO\n"
"int i;\n" "int i;\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"#define FOO\n" "#define FOO\n"
"int i;\n" "int i;\n"
"}")); "}"));
EXPECT_EQ("#define FOO\n" EXPECT_EQ("#define FOO\n"
"namespace A {\n" "namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A", "} // namespace A",
fixNamespaceEndComments("#define FOO\n" fixNamespaceEndComments("#define FOO\n"
"namespace A {\n" "namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}")); "}"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace A\n" "} // namespace A\n"
"#define FOO\n", "#define FOO\n",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}\n" "}\n"
"#define FOO\n")); "#define FOO\n"));
// No replacement if open & close in different conditional blocks // No replacement if open & close in different conditional blocks
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines EXPECT_EQ("#ifdef 1\n"
"namespace B {\n" "namespace B {\n"
"#endif\n" "#endif\n"
"int i;\n" "int i;\n"
"}\n" "}\n"
"}\n")); "}\n"));
EXPECT_EQ("namespace {\n" EXPECT_EQ("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace\n" "} // namespace\n"
"#if A\n" "#if A\n"
"int i;\n" "int i;\n"
"#else\n" "#else\n"
"int j;\n" "int j;\n"
"#endif", "#endif",
fixNamespaceEndComments("namespace {\n" fixNamespaceEndComments("namespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
▲ Show 20 Lines • Show All 111 Lines • ▼ Show 20 Lines EXPECT_EQ("template <int> struct a {};\n"
"void d() {\n" "void d() {\n"
"}\n")); "}\n"));
} }
TEST_F(NamespaceEndCommentsFixerTest, IgnoreUnbalanced) { TEST_F(NamespaceEndCommentsFixerTest, IgnoreUnbalanced) {
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"class Foo {\n" "class Foo {\n"
"}\n" "}\n"
"}// namespace A\n", "} // namespace A\n",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
"class Foo {\n" "class Foo {\n"
"}\n" "}\n"
"}\n")); "}\n"));
EXPECT_EQ("namespace A {\n" EXPECT_EQ("namespace A {\n"
"class Foo {\n" "class Foo {\n"
"}\n", "}\n",
fixNamespaceEndComments("namespace A {\n" fixNamespaceEndComments("namespace A {\n"
Show All 22 Lines EXPECT_EQ("namespace OneLinerNamespace {}\n",
fixNamespaceEndComments("namespace OneLinerNamespace {}\n", Style)); fixNamespaceEndComments("namespace OneLinerNamespace {}\n", Style));
EXPECT_EQ("namespace ShortNamespace {\n" EXPECT_EQ("namespace ShortNamespace {\n"
"}\n", "}\n",
fixNamespaceEndComments("namespace ShortNamespace {\n" fixNamespaceEndComments("namespace ShortNamespace {\n"
"}\n", "}\n",
Style)); Style));
EXPECT_EQ("namespace LongNamespace {\n" EXPECT_EQ("namespace LongNamespace {\n"
"int i;\n" "int i;\n"
"}// namespace LongNamespace\n", "} // namespace LongNamespace\n",
fixNamespaceEndComments("namespace LongNamespace {\n" fixNamespaceEndComments("namespace LongNamespace {\n"
"int i;\n" "int i;\n"
"}\n", "}\n",
Style)); Style));
} }
TEST_F(ShortNamespaceLinesTest, OneUnwrappedLine) { TEST_F(ShortNamespaceLinesTest, OneUnwrappedLine) {
constexpr auto DefaultUnwrappedLines = 1u; constexpr auto DefaultUnwrappedLines = 1u;
auto const Style = getLLVMStyle(); auto const Style = getLLVMStyle();
EXPECT_EQ(DefaultUnwrappedLines, Style.ShortNamespaceLines); EXPECT_EQ(DefaultUnwrappedLines, Style.ShortNamespaceLines);
EXPECT_EQ("namespace ShortNamespace {\n" EXPECT_EQ("namespace ShortNamespace {\n"
"int i;\n" "int i;\n"
"}\n", "}\n",
fixNamespaceEndComments("namespace ShortNamespace {\n" fixNamespaceEndComments("namespace ShortNamespace {\n"
"int i;\n" "int i;\n"
"}\n")); "}\n"));
EXPECT_EQ("namespace LongNamespace {\n" EXPECT_EQ("namespace LongNamespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}// namespace LongNamespace\n", "} // namespace LongNamespace\n",
fixNamespaceEndComments("namespace LongNamespace {\n" fixNamespaceEndComments("namespace LongNamespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}\n")); "}\n"));
} }
TEST_F(ShortNamespaceLinesTest, MultipleUnwrappedLine) { TEST_F(ShortNamespaceLinesTest, MultipleUnwrappedLine) {
auto Style = getLLVMStyle(); auto Style = getLLVMStyle();
Style.ShortNamespaceLines = 2u; Style.ShortNamespaceLines = 2u;
EXPECT_EQ("namespace ShortNamespace {\n" EXPECT_EQ("namespace ShortNamespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}\n", "}\n",
fixNamespaceEndComments("namespace ShortNamespace {\n" fixNamespaceEndComments("namespace ShortNamespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"}\n", "}\n",
Style)); Style));
EXPECT_EQ("namespace LongNamespace {\n" EXPECT_EQ("namespace LongNamespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"int k;\n" "int k;\n"
"}// namespace LongNamespace\n", "} // namespace LongNamespace\n",
fixNamespaceEndComments("namespace LongNamespace {\n" fixNamespaceEndComments("namespace LongNamespace {\n"
"int i;\n" "int i;\n"
"int j;\n" "int j;\n"
"int k;\n" "int k;\n"
"}\n", "}\n",
Style)); Style));
} }
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Lines EXPECT_EQ("namespace n = nn; {\n"
" int j;\n" " int j;\n"
"}\n", "}\n",
Style)); Style));
EXPECT_EQ("int foo;\n" EXPECT_EQ("int foo;\n"
"namespace n\n" "namespace n\n"
"{\n" "{\n"
" int i;\n" " int i;\n"
" int j;\n" " int j;\n"
"}// namespace n\n", "} // namespace n\n",
fixNamespaceEndComments("int foo;\n" fixNamespaceEndComments("int foo;\n"
"namespace n\n" "namespace n\n"
"{\n" "{\n"
" int i;\n" " int i;\n"
" int j;\n" " int j;\n"
"}\n", "}\n",
Style)); Style));
} }
} // end namespace } // end namespace
} // end namespace format } // end namespace format
} // end namespace clang } // end namespace clang