[clang-format] Fix indent of 'key <...>' and 'key {...}' in text protos

[krasimir]

Summary

This patch fixes the indentation of the code pattern key <...>and key {...} in text protos.
Previously, such line would be alinged depending on the column of the previous
colon, which usually indents too much.

[krasimir]

• Fix similar issue for 'key {...}'

[krasimir]

• Rebase with master

lib/Format/ContinuationIndenter.cpp

unsigned ContinuationIndenter::getNewLineColumn(const LineState &State) {
   //       code(); //
   //     }
   if (Current.is(tok::r_paren) && State.Stack.size() > 1 &&
       (!Current.Next || Current.Next->isOneOf(tok::semi, tok::l_brace)))
     return State.Stack[State.Stack.size() - 2].LastSpace;
   if (NextNonComment->is(TT_TemplateString) && NextNonComment->closesScope())
     return State.Stack[State.Stack.size() - 2].LastSpace;
   if (Current.is(tok::identifier) && Current.Next &&
-      Current.Next->is(TT_DictLiteral))
+      (Current.Next->is(TT_DictLiteral) ||
+       ((Style.Language == FormatStyle::LK_Proto ||
+         Style.Language == FormatStyle::LK_TextProto) &&
+        Current.Next->isOneOf(TT_TemplateOpener, tok::l_brace))))
     return State.Stack.back().Indent;
   if (NextNonComment->is(TT_ObjCStringLiteral) &&
       State.StartOfStringLiteral != 0)
     return State.StartOfStringLiteral - 1;
   if (NextNonComment->isStringLiteral() && State.StartOfStringLiteral != 0)
     return State.StartOfStringLiteral;
   if (NextNonComment->is(tok::lessless) &&
       State.Stack.back().FirstLessLess != 0)

unittests/Format/FormatTestProto.cpp

verifyFormat("option (MyProto.options) = <\n"
                "      field_E: 5\n"
                "    >\n"
                "    msg_field <field_A: 1 field_B: 2 field_C: 3 field_D: 4>\n"
                "    field_e: OK\n"
                "    field_f: OK\n"
                "  }\n"
                "  field_g: OK\n"
                ">;");
+
+  verifyFormat("option (MyProto.options) = <\n"
+               "  app_id: 'com.javax.swing.salsa.latino'\n"
+               "  head_id: 1\n"
+               "  data <key: value>\n"
+               ">;");
+
+  verifyFormat("option (MyProto.options) = {\n"
+               "  app_id: 'com.javax.swing.salsa.latino'\n"
+               "  head_id: 1\n"
+               "  headheadheadheadheadhead_id: 1\n"
+               "  product_data {product {1}}\n"
+               "};");
 }
 
 TEST_F(FormatTestProto, FormatsService) {
   verifyFormat("service SearchService {\n"
                "  rpc Search(SearchRequest) returns (SearchResponse) {\n"
                "    option foo = true;\n"
                "  }\n"
                "};");

unittests/Format/FormatTestTextProto.cpp

verifyFormat("field_a: <f1: 1, f2: <>>\n"
                "      field: <field: 3>\n"
                "      field: <field: 4>\n"
                "      field: ok\n"
                "    >\n"
                "  }\n"
                ">\n"
                "field: OK,\n"
                "field_c <field <field <>>>");
+
+  verifyFormat("app_id: 'com.javax.swing.salsa.latino'\n"
+               "head_id: 1\n"
+               "data <key: value>");
+
+  verifyFormat("app_id: 'com.javax.swing.salsa.latino'\n"
+               "head_id: 1\n"
+               "data <key: value>\n"
+               "tail_id: 2");
+
+  verifyFormat("app_id: 'com.javax.swing.salsa.latino'\n"
+               "head_id: 1\n"
+               "data <key: value>\n"
+               "data {key: value}");
+
+  verifyFormat("app {\n"
+               "  app_id: 'com.javax.swing.salsa.latino'\n"
+               "  head_id: 1\n"
+               "  data <key: value>\n"
+               "}");
+
+  verifyFormat("app: {\n"
+               "  app_id: 'com.javax.swing.salsa.latino'\n"
+               "  head_id: 1\n"
+               "  data <key: value>\n"
+               "}");
+
+  verifyFormat("app_id: 'com.javax.swing.salsa.latino'\n"
+               "headheadheadheadheadhead_id: 1\n"
+               "product_data {product {1}}");
+
+  verifyFormat("app_id: 'com.javax.swing.salsa.latino'\n"
+               "headheadheadheadheadhead_id: 1\n"
+               "product_data <product {1}>");
+
+  verifyFormat("app_id: 'com.javax.swing.salsa.latino'\n"
+               "headheadheadheadheadhead_id: 1\n"
+               "product_data <product <1>>");
+
+  verifyFormat("app <\n"
+               "  app_id: 'com.javax.swing.salsa.latino'\n"
+               "  headheadheadheadheadhead_id: 1\n"
+               "  product_data <product {1}>\n"
+               ">");
 }
 } // end namespace tooling
 } // end namespace clang