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
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index d66271c..d8c02e2 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -127,7 +127,7 @@
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 354654b..8fb4b2a 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -465,6 +465,9 @@
" 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",