Fix several formatting problems.
More specifically:
- Improve formatting of static initializers.
- Fix formatting of lines comments in enums.
- Fix formmating of trailing line comments.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170316 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index 8545f33..7e91cb4 100644
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -43,7 +43,8 @@
parsePPDirective();
break;
case tok::comment:
- parseComment();
+ nextToken();
+ addUnwrappedLine();
break;
case tok::l_brace:
Error |= parseBlock();
@@ -90,22 +91,16 @@
}
}
-void UnwrappedLineParser::parseComment() {
- while (!eof()) {
- nextToken();
- if (FormatTok.NewlinesBefore > 0) {
- addUnwrappedLine();
- return;
- }
- }
-}
-
-void UnwrappedLineParser::parseStatement() {
+void UnwrappedLineParser::parseComments() {
// Consume leading line comments, e.g. for branches without compounds.
while (FormatTok.Tok.is(tok::comment)) {
nextToken();
addUnwrappedLine();
}
+}
+
+void UnwrappedLineParser::parseStatement() {
+ parseComments();
switch (FormatTok.Tok.getKind()) {
case tok::kw_namespace:
@@ -164,6 +159,12 @@
return;
}
break;
+ case tok::equal:
+ nextToken();
+ // Skip initializers as they will be formatted by a later step.
+ if (FormatTok.Tok.is(tok::l_brace))
+ nextToken();
+ break;
default:
nextToken();
break;
@@ -325,6 +326,7 @@
nextToken();
addUnwrappedLine();
++Line.Level;
+ parseComments();
break;
case tok::l_paren:
parseParens();
@@ -332,6 +334,7 @@
case tok::comma:
nextToken();
addUnwrappedLine();
+ parseComments();
break;
case tok::r_brace:
if (HasContents)