This is an archive of the discontinued LLVM Phabricator instance.

Fix Bug 39067: The keyword "try" in C++ function-try-blocks doesn't obey BraceWrapping settings
AbandonedPublic

Authored by owenpan on Sep 27 2018, 1:58 AM.

Reviewers

Summary

Closed by r343305

Path

Size

lib/

Format/

2 lines

unittests/

Format/

10 lines

Show First 20 Lines • Show All 1,260 Lines • ▼ Show 20 Lines	case tok::l_brace:
addUnwrappedLine();		addUnwrappedLine();
return;		return;
}		}
// Otherwise this was a braced init list, and the structural		// Otherwise this was a braced init list, and the structural
// element continues.		// element continues.
break;		break;
case tok::kw_try:		case tok::kw_try:
// We arrive here when parsing function-try blocks.		// We arrive here when parsing function-try blocks.
		if (Style.BraceWrapping.AfterFunction)
		addUnwrappedLine();
parseTryCatch();		parseTryCatch();
return;		return;
case tok::identifier: {		case tok::identifier: {
if (FormatTok->is(TT_MacroBlockEnd)) {		if (FormatTok->is(TT_MacroBlockEnd)) {
addUnwrappedLine();		addUnwrappedLine();
return;		return;
}		}

▲ Show 20 Lines • Show All 1,371 Lines • Show Last 20 Lines

Show First 20 Lines • Show All 2,622 Lines • ▼ Show 20 Lines	EXPECT_EQ("class A {\n"
" }\n"		" }\n"
"};",		"};",
format("class A {\n"		format("class A {\n"
" A()\n : t(0) {}\n"		" A()\n : t(0) {}\n"
" A(int i)\n noexcept() : {}\n"		" A(int i)\n noexcept() : {}\n"
" A(X x)\n"		" A(X x)\n"
" try : t(0) {} catch (...) {}\n"		" try : t(0) {} catch (...) {}\n"
"};"));		"};"));
		FormatStyle Style = getLLVMStyle();
		Style.BreakBeforeBraces = FormatStyle::BS_Custom;
		Style.BraceWrapping.AfterControlStatement = true;
		Style.BraceWrapping.AfterFunction = true;
		EXPECT_EQ("void f()\n"
		"try\n"
		"{\n"
		"}",
		format("void f() try {\n"
		"}", Style));
EXPECT_EQ("class SomeClass {\n"		EXPECT_EQ("class SomeClass {\n"
"public:\n"		"public:\n"
" SomeClass() EXCLUSIVE_LOCK_FUNCTION(mu_);\n"		" SomeClass() EXCLUSIVE_LOCK_FUNCTION(mu_);\n"
"};",		"};",
format("class SomeClass {\n"		format("class SomeClass {\n"
"public:\n"		"public:\n"
" SomeClass()\n"		" SomeClass()\n"
" EXCLUSIVE_LOCK_FUNCTION(mu_);\n"		" EXCLUSIVE_LOCK_FUNCTION(mu_);\n"
▲ Show 20 Lines • Show All 10,006 Lines • Show Last 20 Lines