diff options
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 3 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index ce837d42ccc..d2cb5a8723b 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1206,7 +1206,8 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, return Left.Type == TT_ObjCArrayLiteral && Right.isNot(tok::r_square); if (Right.is(tok::r_square)) return Right.Type == TT_ObjCArrayLiteral; - if (Right.is(tok::l_square) && Right.Type != TT_ObjCMethodExpr) + if (Right.is(tok::l_square) && Right.Type != TT_ObjCMethodExpr && + Left.isNot(tok::numeric_constant)) return false; if (Left.is(tok::colon)) return Left.Type != TT_ObjCMethodExpr; diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index aef1dae6fdf..c30133a4b8a 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -6242,5 +6242,14 @@ TEST_F(FormatTest, FormatsWithWebKitStyle) { format("if (aaaaaaaaaaaaaaa || bbbbbbbbbbbbbbb) { i++; }", Style)); } +TEST_F(FormatTest, FormatsProtocolBufferDefinitions) { + // It seems that clang-format can format protocol buffer definitions + // (see https://code.google.com/p/protobuf/). + verifyFormat("message SomeMessage {\n" + " required int32 field1 = 1;\n" + " optional string field2 = 2 [default = \"2\"]\n" + "}"); +} + } // end namespace tooling } // end namespace clang |
