summaryrefslogtreecommitdiffstats
path: root/clang/unittests/Format/FormatTestComments.cpp
diff options
context:
space:
mode:
authorKrasimir Georgiev <krasimir@google.com>2017-08-23 07:18:36 +0000
committerKrasimir Georgiev <krasimir@google.com>2017-08-23 07:18:36 +0000
commit4a9c260751815ea03026a066f8c3296049b6c544 (patch)
tree9981ee4f61a376a439ad1a561249989e9f46084e /clang/unittests/Format/FormatTestComments.cpp
parentd5d559421f41684b69ddba76938136426f7f29a2 (diff)
downloadbcm5719-llvm-4a9c260751815ea03026a066f8c3296049b6c544.tar.gz
bcm5719-llvm-4a9c260751815ea03026a066f8c3296049b6c544.zip
[clang-format] Align trailing comments if ColumnLimit is 0
Summary: ColumnLimit = 0 means no limit, so comment should always be aligned if requested. This was broken with https://llvm.org/svn/llvm-project/cfe/trunk@304687 introduced via https://reviews.llvm.org/D33830 and is included in 5.0.0-rc2. This commit fixes it and adds a unittest for this property. Should go into clang-5.0 IMHO. Contributed by @pboettch! Reviewers: djasper, krasimir Reviewed By: djasper, krasimir Subscribers: hans, klimek Differential Revision: https://reviews.llvm.org/D36967 llvm-svn: 311532
Diffstat (limited to 'clang/unittests/Format/FormatTestComments.cpp')
-rw-r--r--clang/unittests/Format/FormatTestComments.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/clang/unittests/Format/FormatTestComments.cpp b/clang/unittests/Format/FormatTestComments.cpp
index ffcfb3cfe8b..79dc003ae85 100644
--- a/clang/unittests/Format/FormatTestComments.cpp
+++ b/clang/unittests/Format/FormatTestComments.cpp
@@ -2476,6 +2476,13 @@ TEST_F(FormatTestComments, AlignTrailingComments) {
"int k; // line longg long",
getLLVMStyleWithColumns(20)));
+ // Always align if ColumnLimit = 0
+ EXPECT_EQ("int i, j; // line 1\n"
+ "int k; // line longg long",
+ format("int i, j; // line 1\n"
+ "int k; // line longg long",
+ getLLVMStyleWithColumns(0)));
+
// Align comment line sections aligned with the next token with the next
// token.
EXPECT_EQ("class A {\n"
OpenPOWER on IntegriCloud