Add other directives

Author: sstwcw

clang/lib/Format/UnwrappedLineParser.cpp

@@ -4860,7 +4860,8 @@ void UnwrappedLineParser::readToken(int LevelDifference) {
       assert(Next); // There is an EOF token at the end.
       if ((Style.isVerilog() && !Keywords.isVerilogPPDirective(*Next)) ||
           (Style.isTableGen() &&
-           !Next->isOneOf(tok::pp_define, tok::pp_ifdef, tok::pp_ifndef))) {
+           !Next->isOneOf(tok::kw_else, tok::pp_define, tok::pp_ifdef,
+                          tok::pp_ifndef, tok::pp_endif))) {
         break;
       }
       distributeComments(Comments, FormatTok);

clang/unittests/Format/TokenAnnotatorTest.cpp

@@ -2838,16 +2838,21 @@ TEST_F(TokenAnnotatorTest, UnderstandTableGenTokens) {
                     "#embed {}");
   ASSERT_EQ(Tokens.size(), 7u) << Tokens;
   EXPECT_TOKEN(Tokens[1], tok::identifier, TT_StartOfName);
-  EXPECT_TOKEN(Tokens[2], tok::hash, TT_Unknown);
   EXPECT_EQ(Tokens[1]->Next, Tokens[2]);
   Tokens = Annotate("def x\n"
                     "#define x\n"
                     "#embed {}");
   ASSERT_EQ(Tokens.size(), 10u) << Tokens;
   EXPECT_TOKEN(Tokens[1], tok::identifier, TT_StartOfName);
-  EXPECT_TOKEN(Tokens[2], tok::hash, TT_Unknown);
-  EXPECT_TOKEN(Tokens[5], tok::hash, TT_Unknown);
   EXPECT_EQ(Tokens[1]->Next, Tokens[5]);
+  Tokens = Annotate("def x\n"
+                    "#ifdef x\n"
+                    "#else\n"
+                    "#endif\n"
+                    "#embed {}");
+  ASSERT_EQ(Tokens.size(), 14u) << Tokens;
+  EXPECT_TOKEN(Tokens[1], tok::identifier, TT_StartOfName);
+  EXPECT_EQ(Tokens[1]->Next, Tokens[9]);
 
   auto AnnotateValue = [this, &Style](StringRef Code) {
     // Values are annotated only in specific context.