diff options
| -rw-r--r-- | lib/Format/Format.cpp | 2 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 3 |
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", |