diff options
| -rw-r--r-- | lib/Format/UnwrappedLineParser.cpp | 3 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp index 0c8ff89049..b3671b3040 100644 --- a/lib/Format/UnwrappedLineParser.cpp +++ b/lib/Format/UnwrappedLineParser.cpp @@ -317,7 +317,8 @@ void UnwrappedLineParser::parseStructuralElement() { case tok::kw_enum: parseEnum(); return; - case tok::kw_struct: // fallthrough + case tok::kw_struct: // fallthrough + case tok::kw_union: // fallthrough case tok::kw_class: parseStructClassOrBracedList(); return; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index a46c9b685b..f3da5061f2 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -343,6 +343,7 @@ TEST_F(FormatTest, FormatsDerivedClass) { TEST_F(FormatTest, FormatsVariableDeclarationsAfterStructOrClass) { verifyFormat("class A {} a, b;"); verifyFormat("struct A {} a, b;"); + verifyFormat("union A {} a;"); } TEST_F(FormatTest, FormatsEnum) { |