Revert "Revert "[clang-format] Keep protobuf "package" statement on one line""

[dchai]

Summary

Top-level "package" and "import" statements should generally be kept on
one line, for all languages.

---

This reverts commit rL356912.
The regression from rL356835 was fixed via rC358275.

[dchai]

Friendly ping.

[dchai]

Hi, can someone please merge this on my behalf? I don't have commit access.

[dchai]

no-op to try to get rid of "Changes Planned" state

[krasimir]

Sorry for the delay. I'll submit this for you.

lib/Format/TokenAnnotator.cpp

LineType parseLine() {
 
     // If this line starts and ends in '<' and '>', respectively, it is likely
     // part of "#define <a/b.h>".
     if (CurrentToken->is(tok::less) && Line.Last->is(tok::greater)) {
       parseIncludeDirective();
       return LT_ImportStatement;
     }
 
-    // In .proto files, top-level options are very similar to import statements
-    // and should not be line-wrapped.
+    // In .proto files, top-level options and package statements are very
+    // similar to import statements and should not be line-wrapped.
     if (Style.Language == FormatStyle::LK_Proto && Line.Level == 0 &&
-        CurrentToken->is(Keywords.kw_option)) {
+        CurrentToken->isOneOf(Keywords.kw_option, Keywords.kw_package)) {
       next();
       if (CurrentToken && CurrentToken->is(tok::identifier)) {
         while (CurrentToken)
           next();
         return LT_ImportStatement;
       }
     }
 

unittests/Format/FormatTestProto.cpp

TEST_F(FormatTestProto, FormatsOptions) {
   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, DoesntWrapPackageStatements) {
+  verifyFormat(
+      "package"
+      " some.really.long.package.that.exceeds.the.column.limit00000000;");
+}
+
+TEST_F(FormatTestProto, TrailingCommentAfterPackage) {
+  verifyFormat("package foo.pkg;  // comment\n");
+}
+
 TEST_F(FormatTestProto, FormatsService) {
   verifyFormat("service SearchService {\n"
                "  rpc Search(SearchRequest) returns (SearchResponse) {\n"
                "    option foo = true;\n"
                "  }\n"
                "};");
 }