Browse Source

clang-format: Don't bin-pack text-proto-formatted options.

Before:
  repeated double value = 1
      [(aaaaaaa.aaaaaaaaa) = {aaaaaaaaaaaaaaaa: AAAAAAAAAA,
                              bbbbbbb: BBBB, bbbb: BBB}];

After:
  repeated double value = 1
      [(aaaaaaa.aaaaaaaaa) = {aaaaaaaaaaaaaaaa: AAAAAAAAAA,
                              bbbbbbb: BBBB,
                              bbbb: BBB}];

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@207538 91177308-0d34-0410-b5e6-96231b3b80d8
Daniel Jasper 11 years ago
parent
commit
cdbc68e56e
2 changed files with 5 additions and 0 deletions
  1. 1 0
      lib/Format/ContinuationIndenter.cpp
  2. 4 0
      unittests/Format/FormatTestProto.cpp

+ 1 - 0
lib/Format/ContinuationIndenter.cpp

@@ -725,6 +725,7 @@ unsigned ContinuationIndenter::moveStateToNextToken(LineState &State,
       AvoidBinPacking = Current.BlockKind == BK_Block ||
       AvoidBinPacking = Current.BlockKind == BK_Block ||
                         Current.Type == TT_ArrayInitializerLSquare ||
                         Current.Type == TT_ArrayInitializerLSquare ||
                         Current.Type == TT_DictLiteral ||
                         Current.Type == TT_DictLiteral ||
+                        Style.Language == FormatStyle::LK_Proto ||
                         !Style.BinPackParameters ||
                         !Style.BinPackParameters ||
                         (NextNoComment &&
                         (NextNoComment &&
                          NextNoComment->Type == TT_DesignatedInitializerPeriod);
                          NextNoComment->Type == TT_DesignatedInitializerPeriod);

+ 4 - 0
unittests/Format/FormatTestProto.cpp

@@ -88,6 +88,10 @@ TEST_F(FormatTestProto, MessageFieldAttributes) {
   verifyFormat("repeated double value = 1\n"
   verifyFormat("repeated double value = 1\n"
                "    [(aaaaaaa.aaaaaaaaa) = {aaaaaaaaaaaaaaaa: AAAAAAAAAA\n"
                "    [(aaaaaaa.aaaaaaaaa) = {aaaaaaaaaaaaaaaa: AAAAAAAAAA\n"
                "                            bbbbbbbbbbbbbbbb: BBBBBBBBBB}];");
                "                            bbbbbbbbbbbbbbbb: BBBBBBBBBB}];");
+  verifyFormat("repeated double value = 1\n"
+               "    [(aaaaaaa.aaaaaaaaa) = {aaaaaaaaaaaaaaaa: AAAAAAAAAA,\n"
+               "                            bbbbbbb: BBBB,\n"
+               "                            bbbb: BBB}];");
 }
 }
 
 
 TEST_F(FormatTestProto, FormatsOptions) {
 TEST_F(FormatTestProto, FormatsOptions) {