From 6bd0232b4f58e7ad40f687b09b0eb897bcc3fd1e Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Sun, 3 Feb 2013 18:07:15 +0000 Subject: Fix bug in formatting of nested initializers. We can now format: SomeArrayOfSomeType a = { { { 1, 2, 3 } }, { { 1, 2, 3 } }, { { 111111111111111111111111111111, 222222222222222222222222222222, 333333333333333333333333333333 } }, { { 1, 2, 3 } }, { { 1, 2, 3 } } }; Before, we did strange things there. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174291 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/Format.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/Format/Format.cpp') diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index d638221de6..6cfa0d8823 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -528,7 +528,6 @@ private: if (Current.is(tok::question)) State.Stack.back().QuestionColumn = State.Column; if (Current.is(tok::l_brace) && Current.MatchingParen != NULL && - Current.Children[0].isNot(tok::l_brace) && !Current.MatchingParen->MustBreakBefore) { AnnotatedToken *End = Current.MatchingParen; while (!End->Children.empty() && !End->Children[0].CanBreakBefore) { -- cgit v1.2.3-18-g5258