Clang-format: Fix for #pragma option formatting

[razmser]

Summary

Fix for code breaking formatting of #pragma option
pragma option documentation

[djasper]

Just a few nitpicks. Sorry for the delay.

lib/Format/TokenAnnotator.cpp

592

Generally, we should use the new Keywords object here and above. But I can fix that as a follow-up.

593

Just use CurrentToken->Previous?

597

We don't use braces around single-statement ifs in LLVM/Clang.

[razmser]

Fixed nitpicks.
If I understand right, in order to use Keywords object I must create new annotations for #pragma mark and #pragma option. I can do it, but I think that should be done in separate commit.

[djasper]

Modified and submitted as r235492. Thank you.

lib/Format/TokenAnnotator.cpp

void parsePragma() {
     next(); // Consume "pragma".
     if (CurrentToken && CurrentToken->TokenText == "mark") {
       next(); // Consume "mark".
       next(); // Consume first token (so we fix leading whitespace).
       while (CurrentToken) {
         CurrentToken->Type = TT_ImplicitStringLiteral;
         next();
       }
+    } else if (CurrentToken && CurrentToken->TokenText == "option") {
+      next(); // Consume "option".
+      while (CurrentToken) {
+        // Don't add space after binary operator.
+        if (CurrentToken->Previous->Type == TT_BinaryOperator)
+          CurrentToken->Type = TT_ImplicitStringLiteral;
+        next();
+      }
     }
   }
 
   LineType parsePreprocessorDirective() {
     LineType Type = LT_PreprocessorDirective;
     next();
     if (!CurrentToken)
       return Type;

unittests/Format/FormatTest.cpp

TEST_F(FormatTest, UnderstandsPragmas) {
   verifyFormat("#pragma omp reduction(+ : var)");
 
   EXPECT_EQ("#pragma mark Any non-hyphenated or hyphenated string "
             "(including parentheses).",
             format("#pragma    mark   Any non-hyphenated or hyphenated string "
                    "(including parentheses)."));
 }
 
+TEST_F(FormatTest, UnderstandPragmaOption) {
+  verifyFormat("#pragma option -C -A");
+
+  EXPECT_EQ("#pragma option -C -A", format("#pragma    option   -C   -A"));
+}
+
 #define EXPECT_ALL_STYLES_EQUAL(Styles)                                        \
   for (size_t i = 1; i < Styles.size(); ++i)                                   \
     EXPECT_EQ(Styles[0], Styles[i]) << "Style #" << i << " of "                \
                                     << Styles.size()                           \
                                     << " differs from Style #0"
 
 TEST_F(FormatTest, GetsPredefinedStyleByName) {
   SmallVector<FormatStyle, 3> Styles;