Handle comment above PP Directive

Author: gedare

clang/lib/Format/UnwrappedLineFormatter.cpp

@@ -63,7 +63,7 @@ class LevelIndentTracker {
     if (Line.Level >= IndentForLevel.size())
       IndentForLevel.resize(Line.Level + 1, -1);
     if (Style.IndentPPDirectives == FormatStyle::PPDIS_Leave &&
-        Line.InPPDirective) {
+        (Line.InPPDirective || Line.Type == LT_CommentAbovePPDirective)) {
       Indent = Line.InMacroBody
                    ? (Line.Level - Line.PPLevel) * Style.IndentWidth +
                          AdditionalIndent

clang/unittests/Format/FormatTest.cpp

@@ -5585,6 +5585,13 @@ TEST_F(FormatTest, IndentsPPDirectiveWithPPIndentWidth) {
                  "}\n"
                  "  #endif",
                  style);
+  verifyNoChange("#ifdef foo\n"
+                 "#else\n"
+                 "/* This is a comment */\n"
+                 "#ifdef BAR\n"
+                 "#endif\n"
+                 "#endif",
+                 style);
 
   style.IndentWidth = 1;
   style.PPIndentWidth = 4;