=?utf-8?q?Björn_Schäpers?= <[email protected]>,
=?utf-8?q?Björn_Schäpers?= <[email protected]>
Message-ID:
In-Reply-To: <llvm.org/llvm/llvm-project/pull/[email protected]>
================
@@ -3483,282 +3476,283 @@ TEST_F(FormatTestComments, DontAlignOverScope) {
}
TEST_F(FormatTestComments, AlignsBlockCommentDecorations) {
- EXPECT_EQ("/*\n"
- " */",
- format("/*\n"
- "*/"));
- EXPECT_EQ("/*\n"
- " */",
- format("/*\n"
- " */"));
- EXPECT_EQ("/*\n"
- " */",
- format("/*\n"
- " */"));
+ verifyFormat("/*\n"
+ " */",
+ "/*\n"
+ "*/");
+ verifyFormat("/*\n"
+ " */",
+ "/*\n"
+ " */");
+ verifyFormat("/*\n"
+ " */",
+ "/*\n"
+ " */");
// Align a single line.
- EXPECT_EQ("/*\n"
- " * line */",
- format("/*\n"
- "* line */"));
- EXPECT_EQ("/*\n"
- " * line */",
- format("/*\n"
- " * line */"));
- EXPECT_EQ("/*\n"
- " * line */",
- format("/*\n"
- " * line */"));
- EXPECT_EQ("/*\n"
- " * line */",
- format("/*\n"
- " * line */"));
- EXPECT_EQ("/**\n"
- " * line */",
- format("/**\n"
- "* line */"));
- EXPECT_EQ("/**\n"
- " * line */",
- format("/**\n"
- " * line */"));
- EXPECT_EQ("/**\n"
- " * line */",
- format("/**\n"
- " * line */"));
- EXPECT_EQ("/**\n"
- " * line */",
- format("/**\n"
- " * line */"));
- EXPECT_EQ("/**\n"
- " * line */",
- format("/**\n"
- " * line */"));
+ verifyFormat("/*\n"
+ " * line */",
+ "/*\n"
+ "* line */");
+ verifyFormat("/*\n"
+ " * line */",
+ "/*\n"
+ " * line */");
+ verifyFormat("/*\n"
+ " * line */",
+ "/*\n"
+ " * line */");
+ verifyFormat("/*\n"
+ " * line */",
+ "/*\n"
+ " * line */");
+ verifyFormat("/**\n"
+ " * line */",
+ "/**\n"
+ "* line */");
+ verifyFormat("/**\n"
+ " * line */",
+ "/**\n"
+ " * line */");
+ verifyFormat("/**\n"
+ " * line */",
+ "/**\n"
+ " * line */");
+ verifyFormat("/**\n"
+ " * line */",
+ "/**\n"
+ " * line */");
+ verifyFormat("/**\n"
+ " * line */",
+ "/**\n"
+ " * line */");
// Align the end '*/' after a line.
- EXPECT_EQ("/*\n"
- " * line\n"
- " */",
- format("/*\n"
- "* line\n"
- "*/"));
- EXPECT_EQ("/*\n"
- " * line\n"
- " */",
- format("/*\n"
- " * line\n"
- " */"));
- EXPECT_EQ("/*\n"
- " * line\n"
- " */",
- format("/*\n"
- " * line\n"
- " */"));
+ verifyFormat("/*\n"
+ " * line\n"
+ " */",
+ "/*\n"
+ "* line\n"
+ "*/");
+ verifyFormat("/*\n"
+ " * line\n"
+ " */",
+ "/*\n"
+ " * line\n"
+ " */");
+ verifyFormat("/*\n"
+ " * line\n"
+ " */",
+ "/*\n"
+ " * line\n"
+ " */");
// Align two lines.
- EXPECT_EQ("/* line 1\n"
- " * line 2 */",
- format("/* line 1\n"
- " * line 2 */"));
- EXPECT_EQ("/* line 1\n"
- " * line 2 */",
- format("/* line 1\n"
- "* line 2 */"));
- EXPECT_EQ("/* line 1\n"
- " * line 2 */",
- format("/* line 1\n"
- " * line 2 */"));
- EXPECT_EQ("/* line 1\n"
- " * line 2 */",
- format("/* line 1\n"
- " * line 2 */"));
- EXPECT_EQ("/* line 1\n"
- " * line 2 */",
- format("/* line 1\n"
- " * line 2 */"));
- EXPECT_EQ("int i; /* line 1\n"
- " * line 2 */",
- format("int i; /* line 1\n"
- "* line 2 */"));
- EXPECT_EQ("int i; /* line 1\n"
- " * line 2 */",
- format("int i; /* line 1\n"
- " * line 2 */"));
- EXPECT_EQ("int i; /* line 1\n"
- " * line 2 */",
- format("int i; /* line 1\n"
- " * line 2 */"));
+ verifyFormat("/* line 1\n"
+ " * line 2 */",
+ "/* line 1\n"
+ " * line 2 */");
+ verifyFormat("/* line 1\n"
+ " * line 2 */",
+ "/* line 1\n"
+ "* line 2 */");
+ verifyFormat("/* line 1\n"
+ " * line 2 */",
+ "/* line 1\n"
+ " * line 2 */");
+ verifyFormat("/* line 1\n"
+ " * line 2 */",
+ "/* line 1\n"
+ " * line 2 */");
+ verifyFormat("/* line 1\n"
+ " * line 2 */",
+ "/* line 1\n"
+ " * line 2 */");
+ verifyFormat("int i; /* line 1\n"
+ " * line 2 */",
+ "int i; /* line 1\n"
+ "* line 2 */");
+ verifyFormat("int i; /* line 1\n"
+ " * line 2 */",
+ "int i; /* line 1\n"
+ " * line 2 */");
+ verifyFormat("int i; /* line 1\n"
+ " * line 2 */",
+ "int i; /* line 1\n"
+ " * line 2 */");
// Align several lines.
- EXPECT_EQ("/* line 1\n"
- " * line 2\n"
- " * line 3 */",
- format("/* line 1\n"
- " * line 2\n"
- "* line 3 */"));
- EXPECT_EQ("/* line 1\n"
- " * line 2\n"
- " * line 3 */",
- format("/* line 1\n"
- " * line 2\n"
- "* line 3 */"));
- EXPECT_EQ("/*\n"
- "** line 1\n"
- "** line 2\n"
- "*/",
- format("/*\n"
- "** line 1\n"
- " ** line 2\n"
- "*/"));
+ verifyFormat("/* line 1\n"
+ " * line 2\n"
+ " * line 3 */",
+ "/* line 1\n"
+ " * line 2\n"
+ "* line 3 */");
+ verifyFormat("/* line 1\n"
+ " * line 2\n"
+ " * line 3 */",
+ "/* line 1\n"
+ " * line 2\n"
+ "* line 3 */");
+ verifyFormat("/*\n"
+ "** line 1\n"
+ "** line 2\n"
+ "*/",
+ "/*\n"
+ "** line 1\n"
+ " ** line 2\n"
+ "*/");
// Align with different indent after the decorations.
- EXPECT_EQ("/*\n"
- " * line 1\n"
- " * line 2\n"
- " * line 3\n"
- " * line 4\n"
- " */",
- format("/*\n"
- "* line 1\n"
- " * line 2\n"
- " * line 3\n"
- "* line 4\n"
- "*/"));
+ verifyFormat("/*\n"
+ " * line 1\n"
+ " * line 2\n"
+ " * line 3\n"
+ " * line 4\n"
+ " */",
+ "/*\n"
+ "* line 1\n"
+ " * line 2\n"
+ " * line 3\n"
+ "* line 4\n"
+ "*/");
// Align empty or blank lines.
- EXPECT_EQ("/**\n"
- " *\n"
- " *\n"
- " *\n"
- " */",
- format("/**\n"
- "* \n"
- " * \n"
- " *\n"
- "*/"));
+ verifyFormat("/**\n"
+ " *\n"
+ " *\n"
+ " *\n"
+ " */",
+ "/**\n"
+ "* \n"
+ " * \n"
+ " *\n"
+ "*/");
// Align while breaking and reflowing.
- EXPECT_EQ("/*\n"
- " * long long long\n"
- " * long long\n"
- " *\n"
- " * long */",
- format("/*\n"
- " * long long long long\n"
- " * long\n"
- " *\n"
- "* long */",
- getLLVMStyleWithColumns(20)));
+ verifyFormat("/*\n"
+ " * long long long\n"
+ " * long long\n"
+ " *\n"
+ " * long */",
+ "/*\n"
+ " * long long long long\n"
+ " * long\n"
+ " *\n"
+ "* long */",
+ getLLVMStyleWithColumns(20));
}
TEST_F(FormatTestComments, NoCrash_Bug34236) {
// This is a test case from a crasher reported in:
// https://bugs.llvm.org/show_bug.cgi?id=34236
// Temporarily disable formatting for readability.
// clang-format off
- EXPECT_EQ(
+ verifyFormat(
"/* */ /*\n"
" *
a\n"
" * b c
d*/",
- format(
+
----------------
owenca wrote:
Ditto.
https://github.com/llvm/llvm-project/pull/164310
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
