Fix formatting regression introduced by r174307.
In preprocessor definitions, we would not parse all the tokens and thus
not annotate them anymore. This led to a wrong formatting of comments
in google style:
#endif // HEADER_GUARD -- requires two spaces
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174361 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 34bccb9..f34bc89 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -423,6 +423,8 @@
default:
break;
}
+ while (CurrentToken != NULL)
+ next();
}
LineType parseLine() {
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 5b99716..f5606cb 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -479,6 +479,8 @@
verifyFormat("someFunction(anotherFunction( // Force break.\n"
" parameter));");
+
+ verifyGoogleFormat("#endif // HEADER_GUARD");
}
TEST_F(FormatTest, UnderstandsMultiLineComments) {