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

[Haojian Wu via cfe-commits]

Author: hokein
Date: Mon Mar 25 08:46:07 2019
New Revision: 356912

URL: http://llvm.org/viewvc/llvm-project?rev=356912&view=rev
Log:
Revert "[clang-format] Keep protobuf "package" statement on one line"

This reverts commit r356835. This patch causes a regression, see the
test below:

verifyFormat("// Detached comment\n\n"
             "// Leading comment\n"
             "syntax = \"proto2\"; // trailing comment\n\n"
             "// in foo.bar package\n"
             "package foo.bar; // foo.bar package\n");

Modified:
    cfe/trunk/lib/Format/TokenAnnotator.cpp
    cfe/trunk/unittests/Format/FormatTestProto.cpp

Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=356912&r1=356911&r2=356912&view=diff
==============================================================================
--- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp Mon Mar 25 08:46:07 2019
@@ -1119,10 +1119,10 @@ public:
       return LT_ImportStatement;
     }
 
-    // In .proto files, top-level options and package statements are very
-    // similar to import statements and should not be line-wrapped.
+    // In .proto files, top-level options are very similar to import statements
+    // and should not be line-wrapped.
     if (Style.Language == FormatStyle::LK_Proto && Line.Level == 0 &&
-        CurrentToken->isOneOf(Keywords.kw_option, Keywords.kw_package)) {
+        CurrentToken->is(Keywords.kw_option)) {
       next();
       if (CurrentToken && CurrentToken->is(tok::identifier))
         return LT_ImportStatement;

Modified: cfe/trunk/unittests/Format/FormatTestProto.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTestProto.cpp?rev=356912&r1=356911&r2=356912&view=diff
==============================================================================
--- cfe/trunk/unittests/Format/FormatTestProto.cpp (original)
+++ cfe/trunk/unittests/Format/FormatTestProto.cpp Mon Mar 25 08:46:07 2019
@@ -393,12 +393,6 @@ TEST_F(FormatTestProto, FormatsOptions)
                "};");
 }
 
-TEST_F(FormatTestProto, DoesntWrapPackageStatements) {
-  verifyFormat(
-      "package"
-      " some.really.long.package.that.exceeds.the.column.limit00000000;");
-}
-
 TEST_F(FormatTestProto, FormatsService) {
   verifyFormat("service SearchService {\n"
                "  rpc Search(SearchRequest) returns (SearchResponse) {\n"