clang-format: use `pb` as a canonical raw string delimiter for google style

[krasimir]

Summary

This updates the canonical text proto raw string delimiter to pb for Google style, moving codebases towards a simpler and more consistent style.

Also updates a behavior where the canonical delimiter was not applied for raw strings with empty delimiters detected via well-known enclosing functions that expect a text proto, effectively making the canonical delimiter more viral. This feature is not widely used so this should be safe and more in line with promoting the canonicity of the canonical delimiter.

[krasimir]

clang-format: use pb as a canonical raw string delimiter for google style

[krasimir]

Update tests

[krasimir]

Collect commits

[sammccall]

Also fixes a bug where the canonical delimiter was not applied for raw strings with empty delimiters detected via well-known enclosing functions that expect a text proto.

Are you sure this was a bug rather than intended behavior? Seems... not unreasonable.

CanonicalDelemiter seems very rarely used so far though, so should be safe.

[krasimir]

In D97688#2610657, @sammccall wrote:

Also fixes a bug where the canonical delimiter was not applied for raw strings with empty delimiters detected via well-known enclosing functions that expect a text proto.

Are you sure this was a bug rather than intended behavior? Seems... not unreasonable.

CanonicalDelemiter seems very rarely used so far though, so should be safe.

Good point! I agree that is a reasonable behavior as well, so it's not a bug but a change of behavior. Agree that this should be safe.

clang/lib/Format/ContinuationIndenter.cpp

 
 unsigned ContinuationIndenter::reformatRawStringLiteral(
     const FormatToken &Current, LineState &State,
     const FormatStyle &RawStringStyle, bool DryRun, bool Newline) {
   unsigned StartColumn = State.Column - Current.ColumnWidth;
   StringRef OldDelimiter = *getRawStringDelimiter(Current.TokenText);
   StringRef NewDelimiter =
       getCanonicalRawStringDelimiter(Style, RawStringStyle.Language);
-  if (NewDelimiter.empty() || OldDelimiter.empty())
+  if (NewDelimiter.empty())
     NewDelimiter = OldDelimiter;
   // The text of a raw string is between the leading 'R"delimiter(' and the
   // trailing 'delimiter)"'.
   unsigned OldPrefixSize = 3 + OldDelimiter.size();
   unsigned OldSuffixSize = 2 + OldDelimiter.size();
   // We create a virtual text environment which expects a null-terminated
   // string, so we cannot use StringRef.
   std::string RawText = std::string(

clang/lib/Format/Format.cpp

GoogleStyle.RawStringFormats = {
               "PARSE_PARTIAL_TEXT_PROTO",
               "PARSE_TEST_PROTO",
               "PARSE_TEXT_PROTO",
               "ParseTextOrDie",
               "ParseTextProtoOrDie",
               "ParseTestProto",
               "ParsePartialTestProto",
           },
-          /*CanonicalDelimiter=*/"",
+          /*CanonicalDelimiter=*/"pb",
           /*BasedOnStyle=*/"google",
       },
   };
   GoogleStyle.SpacesBeforeTrailingComments = 2;
   GoogleStyle.Standard = FormatStyle::LS_Auto;
 
   GoogleStyle.PenaltyReturnTypeOnItsOwnLine = 200;
   GoogleStyle.PenaltyBreakBeforeFirstCallParameter = 1;

clang/unittests/Format/FormatTestRawStrings.cpp

 a = ParseTextProto<ProtoType>(
     R"(key: value)");)test",
             format(R"test(
 a = ParseTextProto<ProtoType>(R"(key:value)");)test",
                    Style));
 }
 
 TEST_F(FormatTestRawStrings, UpdatesToCanonicalDelimiters) {
-  FormatStyle Style = getRawStringPbStyleWithColumns(25);
+  FormatStyle Style = getRawStringPbStyleWithColumns(35);
   Style.RawStringFormats[0].CanonicalDelimiter = "proto";
+  Style.RawStringFormats[0].EnclosingFunctions.push_back("PARSE_TEXT_PROTO");
+
   expect_eq(R"test(a = R"proto(key: value)proto";)test",
             format(R"test(a = R"pb(key:value)pb";)test", Style));
 
+  expect_eq(R"test(PARSE_TEXT_PROTO(R"proto(key: value)proto");)test",
+            format(R"test(PARSE_TEXT_PROTO(R"(key:value)");)test", Style));
+
   // Don't update to canonical delimiter if it occurs as a raw string suffix in
   // the raw string content.
   expect_eq(R"test(a = R"pb(key: ")proto")pb";)test",
             format(R"test(a = R"pb(key:")proto")pb";)test", Style));
 }
 
 TEST_F(FormatTestRawStrings, PenalizesPrefixExcessChars) {
   FormatStyle Style = getRawStringPbStyleWithColumns(60);