[clang-format] Fixes indentation of inner text proto messages

[krasimir]

Summary

Consider the text proto:

message {
  sub { key: value }
}

Previously the first { was TT_Unknown, which caused the inner message to be
indented by the continuation width. This didn't happen for:

message {
  sub: { key: value }
}

This is because the code to mark the first { as a TT_DictLiteral was only
considering the case where it marches forward and reaches a :.

This patch updates this by looking not only for :, but also for < and {.

[djasper]

Looks good

cfe/trunk/lib/Format/TokenAnnotator.cpp

if (CurrentToken) {
         }
         if (CurrentToken->isOneOf(tok::r_paren, tok::r_square))
           return false;
         updateParameterCount(Left, CurrentToken);
         if (CurrentToken->isOneOf(tok::colon, tok::l_brace, tok::less)) {
           FormatToken *Previous = CurrentToken->getPreviousNonComment();
           if (Previous->is(TT_JsTypeOptionalQuestion))
             Previous = Previous->getPreviousNonComment();
-          if (((CurrentToken->is(tok::colon) &&
-                (!Contexts.back().ColonIsDictLiteral || !Style.isCpp())) ||
-               Style.Language == FormatStyle::LK_Proto ||
-               Style.Language == FormatStyle::LK_TextProto) &&
-              (Previous->Tok.getIdentifierInfo() ||
-               Previous->is(tok::string_literal)))
+          if ((CurrentToken->is(tok::colon) &&
+              Style.Language == FormatStyle::LK_TextProto) {
+            Left->Type = TT_DictLiteral;
+            if (Previous->Tok.getIdentifierInfo() ||
+                Previous->is(tok::string_literal))
               Previous->Type = TT_SelectorName;
+          }
           if (CurrentToken->is(tok::colon) ||
               Style.Language == FormatStyle::LK_JavaScript)
             Left->Type = TT_DictLiteral;
         }
         if (CurrentToken->is(tok::comma) &&
             Style.Language == FormatStyle::LK_JavaScript)
           Left->Type = TT_DictLiteral;
         if (!consumeToken())

cfe/trunk/unittests/Format/FormatTestTextProto.cpp

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"
                ">");
+
+  verifyFormat("dcccwrnfioeruvginerurneitinfo {\n"
+               "  exte3nsionrnfvui {key: value}\n"
+               "}");
 }
 
 TEST_F(FormatTestTextProto, DiscardsUnbreakableTailIfCanBreakAfter) {
   // The two closing braces count towards the string UnbreakableTailLength, but
   // since we have broken after the corresponding opening braces, we don't
   // consider that length for string breaking.
   verifyFormat(
       "foo: {\n"
       "  bar: {\n"
       "    text: \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"\n"
       "  }\n"
       "}");
 }
 } // end namespace tooling
 } // end namespace clang