[clang-format] Use SpacesBeforeTrailingComments for "option" directive

[dchai]

Summary

AnnotatingParser::next() is needed to implicitly set TT_BlockComment
versus TT_LineComment. On most other paths through
AnnotatingParser::parseLine(), all tokens are consumed to achieve that.
This change updates one place where this wasn't done.

[krasimir]

Thank you!

[dchai]

Can someone please merge this for me? I don't have commit access.

[krasimir]

I'll merge this.

lib/Format/TokenAnnotator.cpp

if (CurrentToken->is(tok::less) && Line.Last->is(tok::greater)) {
       return LT_ImportStatement;
     }
 
     // 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->is(Keywords.kw_option)) {
       next();
-      if (CurrentToken && CurrentToken->is(tok::identifier))
+      if (CurrentToken && CurrentToken->is(tok::identifier)) {
+        while (CurrentToken)
+          next();
         return LT_ImportStatement;
       }
+    }
 
     bool KeywordVirtualFound = false;
     bool ImportStatement = false;
 
     // import {...} from '...';
     if (Style.Language == FormatStyle::LK_JavaScript &&
         CurrentToken->is(Keywords.kw_import))
       ImportStatement = true;

unittests/Format/FormatTestProto.cpp

 TEST_F(FormatTestProto, DoesntWrapFileOptions) {
   EXPECT_EQ(
       "option java_package = "
       "\"some.really.long.package.that.exceeds.the.column.limit\";",
       format("option    java_package   =    "
              "\"some.really.long.package.that.exceeds.the.column.limit\";"));
 }
 
+TEST_F(FormatTestProto, TrailingCommentAfterFileOption) {
+  verifyFormat("option java_package = \"foo.pkg\";  // comment\n");
+}
+
 TEST_F(FormatTestProto, FormatsOptions) {
   verifyFormat("option (MyProto.options) = {\n"
                "  field_a: OK\n"
                "  field_b: \"OK\"\n"
                "  field_c: \"OK\"\n"
                "  msg_field: { field_d: 123 }\n"
                "};");
   verifyFormat("option (MyProto.options) = {\n"