maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix tests after changes to clang-format in r330573. 

We do now both:
- stop reformatting a sequence after a closing brace in more cases, in
  order to not misindent after an incorrect closing brace
- format the closing brace when formatting the line containing the
  opening brace

llvm-svn: 330580
This commit is contained in:
Manuel Klimek 2018-04-23 11:47:59 +00:00
parent 49ffffbccd
commit 185a5ea70b
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clang-tools-extra/test/clang-tidy/readability-braces-around-statements-format.cpp
View File

@ -19,15 +19,15 @@ void test() {
// CHECK-MESSAGES: :[[@LINE-3]]:26: warning: statement should be inside braces
// CHECK-MESSAGES: :[[@LINE-4]]:35: warning: statement should be inside braces
// CHECK-MESSAGES: :[[@LINE-5]]:38: warning: statement should be inside braces
// CHECK-FIXES: {{^}} if (1) {{{$}}
// CHECK-FIXES-NEXT: {{^}} while (2) {
// CHECK-FIXES-NEXT: {{^}} if (3) {
// CHECK-FIXES-NEXT: {{^}} for (;;) {
// CHECK-FIXES-NEXT: {{^}} do {
// CHECK-FIXES-NEXT: {{^}} ;
// CHECK-FIXES-NEXT: {{^}} } while (false) /**/; /**/
// CHECK-FIXES-NEXT: {{^}} }
// CHECK-FIXES-NEXT: {{^}} }
// CHECK-FIXES-NEXT: {{^}} }
// CHECK-FIXES-NEXT: {{^}} }
// CHECK-FIXES: {{^}} if (1) {{{$}}
// CHECK-FIXES-NEXT: {{^}} while (2) {
// CHECK-FIXES-NEXT: {{^}} if (3) {
// CHECK-FIXES-NEXT: {{^}} for (;;) {
// CHECK-FIXES-NEXT: {{^}} do {
// CHECK-FIXES-NEXT: {{^}} ;
// CHECK-FIXES-NEXT: {{^}} } while (false) /**/; /**/
// CHECK-FIXES-NEXT: {{^}} }
// CHECK-FIXES-NEXT: {{^}} }
// CHECK-FIXES-NEXT: {{^}} }
// CHECK-FIXES-NEXT: {{^}} }
}

18
clang-tools-extra/unittests/include-fixer/IncludeFixerTest.cpp
View File

@ -196,7 +196,8 @@ TEST(IncludeFixer, ScopedNamespaceSymbols) {
runIncludeFixer("namespace a {\nb::bar b;\n}"));
EXPECT_EQ("#include \"bar.h\"\nnamespace A {\na::b::bar b;\n}",
runIncludeFixer("namespace A {\na::b::bar b;\n}"));
EXPECT_EQ("#include \"bar.h\"\nnamespace a {\nvoid func() { b::bar b; }\n}",
EXPECT_EQ("#include \"bar.h\"\nnamespace a {\nvoid func() { b::bar b; }\n} "
"// namespace a",
runIncludeFixer("namespace a {\nvoid func() { b::bar b; }\n}"));
EXPECT_EQ("namespace A { c::b::bar b; }\n",
runIncludeFixer("namespace A { c::b::bar b; }\n"));
@ -258,7 +259,8 @@ TEST(IncludeFixer, FixNamespaceQualifiers) {
runIncludeFixer("namespace a {\nb::bar b;\n}\n"));
EXPECT_EQ("#include \"bar.h\"\nnamespace a {\nb::bar b;\n}\n",
runIncludeFixer("namespace a {\nbar b;\n}\n"));
EXPECT_EQ("#include \"bar.h\"\nnamespace a {\nnamespace b{\nbar b;\n}\n}\n",
EXPECT_EQ("#include \"bar.h\"\nnamespace a {\nnamespace b{\nbar b;\n}\n} "
"// namespace a\n",
runIncludeFixer("namespace a {\nnamespace b{\nbar b;\n}\n}\n"));
EXPECT_EQ("c::b::bar b;\n",
runIncludeFixer("c::b::bar b;\n"));
@ -268,12 +270,12 @@ TEST(IncludeFixer, FixNamespaceQualifiers) {
runIncludeFixer("namespace c {\nbar b;\n}\n"));
// Test common qualifers reduction.
EXPECT_EQ(
"#include \"bar.h\"\nnamespace a {\nnamespace d {\nb::bar b;\n}\n}\n",
runIncludeFixer("namespace a {\nnamespace d {\nbar b;\n}\n}\n"));
EXPECT_EQ(
"#include \"bar.h\"\nnamespace d {\nnamespace a {\na::b::bar b;\n}\n}\n",
runIncludeFixer("namespace d {\nnamespace a {\nbar b;\n}\n}\n"));
EXPECT_EQ("#include \"bar.h\"\nnamespace a {\nnamespace d {\nb::bar b;\n}\n} "
"// namespace a\n",
runIncludeFixer("namespace a {\nnamespace d {\nbar b;\n}\n}\n"));
EXPECT_EQ("#include \"bar.h\"\nnamespace d {\nnamespace a {\na::b::bar "
"b;\n}\n} // namespace d\n",
runIncludeFixer("namespace d {\nnamespace a {\nbar b;\n}\n}\n"));
// Test nested classes.
EXPECT_EQ("#include \"bar.h\"\nnamespace d {\na::b::bar::t b;\n}\n",