From 9c2820c4e35baadc2061dcbdadde2bf060ee013b Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Mon, 23 Jun 2014 07:36:25 +0000 Subject: [PATCH] clang-format: [proto] Add required space before absolute references. llvm-svn: 211488 --- clang/lib/Format/TokenAnnotator.cpp | 4 ++++ clang/unittests/Format/FormatTestProto.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index fdad759..3793fe0 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1406,6 +1406,10 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, const FormatToken &Left, const FormatToken &Right) { if (Style.Language == FormatStyle::LK_Proto) { + if (Right.is(tok::period) && + (Left.TokenText == "optional" || Left.TokenText == "required" || + Left.TokenText == "repeated")) + return true; if (Right.is(tok::l_paren) && (Left.TokenText == "returns" || Left.TokenText == "option")) return true; diff --git a/clang/unittests/Format/FormatTestProto.cpp b/clang/unittests/Format/FormatTestProto.cpp index 6506a6d..bfd5025 100644 --- a/clang/unittests/Format/FormatTestProto.cpp +++ b/clang/unittests/Format/FormatTestProto.cpp @@ -47,6 +47,9 @@ TEST_F(FormatTestProto, FormatsMessages) { " required int32 field1 = 1;\n" "}"); verifyFormat("message SomeMessage {\n" + " required .absolute.Reference field1 = 1;\n" + "}"); + verifyFormat("message SomeMessage {\n" " required int32 field1 = 1;\n" " optional string field2 = 2 [default = \"2\"]\n" "}"); -- 2.7.4