Author: djasper Date: Fri Aug 30 05:36:58 2013 New Revision: 189663 URL: http://llvm.org/viewvc/llvm-project?rev=189663&view=rev Log: clang-format: Enable formatting of protocol buffer definitions.
Almost by accident, clang-format seems to be able to format protocol buffer definitions (https://code.google.com/p/protobuf/). The only change is that a space is required between numeric constants and opening square brackets (for default values). While this might in theory be used for array subscripts (int val = 4[MyArray]), I have not seen this pattern in practice much. If this is wrong, we can make this smarter in the future. Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp cfe/trunk/unittests/Format/FormatTest.cpp Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=189663&r1=189662&r2=189663&view=diff ============================================================================== --- cfe/trunk/lib/Format/TokenAnnotator.cpp (original) +++ cfe/trunk/lib/Format/TokenAnnotator.cpp Fri Aug 30 05:36:58 2013 @@ -1206,7 +1206,8 @@ bool TokenAnnotator::spaceRequiredBetwee 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; Modified: cfe/trunk/unittests/Format/FormatTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=189663&r1=189662&r2=189663&view=diff ============================================================================== --- cfe/trunk/unittests/Format/FormatTest.cpp (original) +++ cfe/trunk/unittests/Format/FormatTest.cpp Fri Aug 30 05:36:58 2013 @@ -6242,5 +6242,14 @@ TEST_F(FormatTest, FormatsWithWebKitStyl 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 _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
