aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2013-02-13 19:25:54 +0000
committerDaniel Jasper <djasper@google.com>2013-02-13 19:25:54 +0000
commit42f458d164cbbee23e55e874b6cee7026ca721ca (patch)
tree4d044a0d7a963cbd97390413446f05527a935d3f
parent82064213e9ef308e9a929ecfb31f4698a834ecdd (diff)
Fix comment alignment close to the column limit.
Due to an error in one of the expressions, we used to not align comments although it would have been possible. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175068 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Format/Format.cpp2
-rw-r--r--unittests/Format/FormatTest.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index d66271ce61..d8c02e2e18 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -127,7 +127,7 @@ public:
else
Comments.back().MinColumn = Spaces;
Comments.back().MaxColumn =
- Style.ColumnLimit - Spaces - Tok.FormatTok.TokenLength;
+ Style.ColumnLimit - Tok.FormatTok.TokenLength;
return;
}
}
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 354654b1e2..8fb4b2acd5 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -465,6 +465,9 @@ TEST_F(FormatTest, UnderstandsSingleLineComments) {
" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
+ verifyFormat("int aaaa; // aaaaa\n"
+ "int aa; // aaaaaaa", getLLVMStyleWithColumns(20));
+
EXPECT_EQ("void f() { // This does something ..\n"
"}\n"
"int a; // This is unrelated",